iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix address space warnings in ipc/

Browse Source 
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Linus Torvalds 2017-09-25 18:37:28 -07:00 committed by Al Viro
parent 878e832ade
commit 6aa211e8ce
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipc/msg.c
View File

@ -590,13 +590,13 @@ static int copy_compat_msqid_from_user(struct msqid64_ds *out, void __user *buf,
{ {
memset(out, 0, sizeof(*out)); memset(out, 0, sizeof(*out));
if (version == IPC_64) { if (version == IPC_64) {
struct compat_msqid64_ds *p = buf; struct compat_msqid64_ds __user *p = buf;
if (get_compat_ipc64_perm(&out->msg_perm, &p->msg_perm)) if (get_compat_ipc64_perm(&out->msg_perm, &p->msg_perm))
return -EFAULT; return -EFAULT;
if (get_user(out->msg_qbytes, &p->msg_qbytes)) if (get_user(out->msg_qbytes, &p->msg_qbytes))
return -EFAULT; return -EFAULT;
} else { } else {
struct compat_msqid_ds *p = buf; struct compat_msqid_ds __user *p = buf;
if (get_compat_ipc_perm(&out->msg_perm, &p->msg_perm)) if (get_compat_ipc_perm(&out->msg_perm, &p->msg_perm))
return -EFAULT; return -EFAULT;
if (get_user(out->msg_qbytes, &p->msg_qbytes)) if (get_user(out->msg_qbytes, &p->msg_qbytes))

4
ipc/sem.c
View File

@ -1636,10 +1636,10 @@ static int copy_compat_semid_from_user(struct semid64_ds *out, void __user *buf,
{ {
memset(out, 0, sizeof(*out)); memset(out, 0, sizeof(*out));
if (version == IPC_64) { if (version == IPC_64) {
struct compat_semid64_ds *p = buf; struct compat_semid64_ds __user *p = buf;
return get_compat_ipc64_perm(&out->sem_perm, &p->sem_perm); return get_compat_ipc64_perm(&out->sem_perm, &p->sem_perm);
} else { } else {
struct compat_semid_ds *p = buf; struct compat_semid_ds __user *p = buf;
return get_compat_ipc_perm(&out->sem_perm, &p->sem_perm); return get_compat_ipc_perm(&out->sem_perm, &p->sem_perm);
} }
} }

4
ipc/shm.c
View File

@ -1193,10 +1193,10 @@ static int copy_compat_shmid_from_user(struct shmid64_ds *out, void __user *buf,
{ {
memset(out, 0, sizeof(*out)); memset(out, 0, sizeof(*out));
if (version == IPC_64) { if (version == IPC_64) {
struct compat_shmid64_ds *p = buf; struct compat_shmid64_ds __user *p = buf;
return get_compat_ipc64_perm(&out->shm_perm, &p->shm_perm); return get_compat_ipc64_perm(&out->shm_perm, &p->shm_perm);
} else { } else {
struct compat_shmid_ds *p = buf; struct compat_shmid_ds __user *p = buf;
return get_compat_ipc_perm(&out->shm_perm, &p->shm_perm); return get_compat_ipc_perm(&out->shm_perm, &p->shm_perm);
} }
} }

2
ipc/syscall.c
View File

@ -171,7 +171,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
COMPAT_SHMLBA); COMPAT_SHMLBA);
if (err < 0) if (err < 0)
return err; return err;
return put_user(raddr, (compat_ulong_t *)compat_ptr(third)); return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
} }
case SHMDT: case SHMDT:
return sys_shmdt(compat_ptr(ptr)); return sys_shmdt(compat_ptr(ptr));