diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2014-03-04 12:39:03 +0100 |
|---|---|---|
| committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2014-03-06 15:35:09 +0100 |
| commit | 291fdb0bcebd5e8db6af767c1fdc522167dad73d (patch) | |
| tree | 019dbcd82cdc4a2e9d6c2426f0c52b8c2eb945e0 | |
| parent | c2e7c3d0ef0d1a3765792a35ae9e6f91a3025214 (diff) | |
| download | op-kernel-dev-291fdb0bcebd5e8db6af767c1fdc522167dad73d.zip op-kernel-dev-291fdb0bcebd5e8db6af767c1fdc522167dad73d.tar.gz | |
ipc/compat_sys_msgrcv: change msgtyp type from long to compat_long_t
Change the type of compat_sys_msgrcv's msgtyp parameter from long
to compat_long_t, since compat user space passes only a 32 bit signed
value.
Let the compat wrapper do proper sign extension to 64 bit of this
parameter.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
| -rw-r--r-- | include/linux/compat.h | 2 | ||||
| -rw-r--r-- | ipc/compat.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 4c42df3..179b1da 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -321,7 +321,7 @@ asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg); asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp, compat_ssize_t msgsz, int msgflg); asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp, - compat_ssize_t msgsz, long msgtyp, int msgflg); + compat_ssize_t msgsz, compat_long_t msgtyp, int msgflg); long compat_sys_msgctl(int first, int second, void __user *uptr); long compat_sys_shmctl(int first, int second, void __user *uptr); long compat_sys_semtimedop(int semid, struct sembuf __user *tsems, diff --git a/ipc/compat.c b/ipc/compat.c index f486b00..e1f4ab6 100644 --- a/ipc/compat.c +++ b/ipc/compat.c @@ -430,9 +430,9 @@ COMPAT_SYSCALL_DEFINE4(msgsnd, int, msqid, compat_uptr_t, msgp, } COMPAT_SYSCALL_DEFINE5(msgrcv, int, msqid, compat_uptr_t, msgp, - compat_ssize_t, msgsz, long, msgtyp, int, msgflg) + compat_ssize_t, msgsz, compat_long_t, msgtyp, int, msgflg) { - return do_msgrcv(msqid, compat_ptr(msgp), (ssize_t)msgsz, msgtyp, + return do_msgrcv(msqid, compat_ptr(msgp), (ssize_t)msgsz, (long)msgtyp, msgflg, compat_do_msg_fill); } |
