cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ioctl_va bug fix #665.

This commit is contained in:
fengbojiang 2022-07-05 17:43:39 +08:00
parent 4b03900402
commit e7757252b3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/compat/ioctl.c
View File

@ -114,7 +114,7 @@ ioctl_va(int fd, unsigned long com, void *data, int argc, ...)
msg->ioctl.cmd = com; msg->ioctl.cmd = com;
msg->ioctl.data = msg->buf_addr; msg->ioctl.data = msg->buf_addr;
memcpy(msg->ioctl.data, data, size); memcpy(msg->ioctl.data, data, size);
msg->buf_addr += size; char *buf_addr = msg->buf_addr + size;
if (argc == 3) { if (argc == 3) {
if (size + clen > msg->buf_len) { if (size + clen > msg->buf_len) {
@ -123,7 +123,6 @@ ioctl_va(int fd, unsigned long com, void *data, int argc, ...)
return -1; return -1;
} }
char *ptr = (char *)(msg->ioctl.data) + offset; char *ptr = (char *)(msg->ioctl.data) + offset;
char *buf_addr = msg->buf_addr;
memcpy(ptr, &buf_addr, sizeof(char *)); memcpy(ptr, &buf_addr, sizeof(char *));
memcpy(buf_addr, cpy_mem, clen); memcpy(buf_addr, cpy_mem, clen);
} }
@ -152,7 +151,7 @@ ioctl_va(int fd, unsigned long com, void *data, int argc, ...)
if (com & IOC_OUT) { if (com & IOC_OUT) {
memcpy(data, retmsg->ioctl.data, size); memcpy(data, retmsg->ioctl.data, size);
if (argc == 3) { if (argc == 3) {
memcpy(cpy_mem, retmsg->buf_addr, clen); memcpy(cpy_mem, buf_addr, clen);
char *ptr = (char *)data + offset; char *ptr = (char *)data + offset;
memcpy(ptr, &cpy_mem, sizeof(void *)); memcpy(ptr, &cpy_mem, sizeof(void *));
} }