Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6aa211e8 authored by Linus Torvalds's avatar Linus Torvalds Committed by Al Viro
Browse files

fix address space warnings in ipc/ 



Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 878e832a

ipc/msg.c

+2 −2
Original line number Diff line number Diff line
@@ -590,13 +590,13 @@ static int copy_compat_msqid_from_user(struct msqid64_ds *out, void __user *buf, 
{

	memset(out, 0, sizeof(*out));

	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))

			return -EFAULT;

		if (get_user(out->msg_qbytes, &p->msg_qbytes))

			return -EFAULT;

	} 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))

			return -EFAULT;

		if (get_user(out->msg_qbytes, &p->msg_qbytes))

ipc/sem.c

+2 −2
Original line number Diff line number Diff line
@@ -1636,10 +1636,10 @@ static int copy_compat_semid_from_user(struct semid64_ds *out, void __user *buf, 
{

	memset(out, 0, sizeof(*out));

	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);

	} 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);

	}

}

ipc/shm.c

+2 −2
Original line number Diff line number Diff line
@@ -1193,10 +1193,10 @@ static int copy_compat_shmid_from_user(struct shmid64_ds *out, void __user *buf, 
{

	memset(out, 0, sizeof(*out));

	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);

	} 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);

	}

}

ipc/syscall.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second, 
			       COMPAT_SHMLBA);

		if (err < 0)

			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:

		return sys_shmdt(compat_ptr(ptr));