Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-14 19:08:04 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix read between pages (#6379)

Browse Source
This commit is contained in:
Rakholiya Jenish 2016-12-26 18:48:13 +05:30 committed by radare
parent 8c30faf35c
commit 1fd6a78671
1 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libr/io/p/io_r2k_linux.c
View File

@ -247,6 +247,11 @@ static void print_help (RIO *io, char *cmd, int p_usage) {
int ReadMemory (RIO *io, RIODesc *iodesc, int ioctl_n, size_t pid, size_t address, ut8 *buf, int len) {
int ret = -1;
int pagesize, newlen;
ut64 pageaddr, offset;
bool flag = 0;
ut8 garbage;
if (iodesc && iodesc->fd > 0 && buf) {
struct r2k_data data;
@ -263,8 +268,53 @@ int ReadMemory (RIO *io, RIODesc *iodesc, int ioctl_n, size_t pid, size_t addres
memcpy (buf, data.buff, len);
ret = len;
} else {
// eprintf ("Read failed. ioctl err: %s\n", strerror (errno)); /*TODO: This needs to be discussed whether to uncomment or not*/
ret = -1;
garbage = io->ff ? io->Oxff : 0xff;
flag = 0;
offset = 0;
pagesize = getpagesize();
pageaddr = address + pagesize;
pageaddr -= (pageaddr % pagesize);
if ((len - (int)(pageaddr - address)) <= 0) {
ret = -1;
} else {
data.len = pageaddr - address;
ret = ioctl (iodesc->fd, ioctl_n, &data);
if (!ret) {
memcpy (buf + offset, data.buff, pageaddr - address);
flag = 1;
} else {
memset (buf + offset, garbage, pageaddr - address);
}
offset = pageaddr - address;
newlen = len - offset;
while (newlen >= pagesize) {
data.addr = pageaddr;
data.len = pagesize;
ret = ioctl (iodesc->fd, ioctl_n, &data);
if (!ret) {
memcpy (buf + offset, data.buff, pagesize);
flag = 1;
} else {
memset (buf + offset, garbage, pagesize);
}
pageaddr += pagesize;
offset += pagesize;
newlen -= pagesize;
}
data.addr = pageaddr;
data.len = newlen;
ret = ioctl (iodesc->fd, ioctl_n, &data);
if (!ret) {
memcpy (buf + offset, data.buff, newlen);
flag = 1;
} else {
memset (buf + offset, garbage, newlen);
}
}
ret = flag ? len : -1;
}
free (data.buff);