Commit 3120b9a6 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'ipc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Pull ipc regression fixes from Arnd Bergmann:
 "Fix ipc regressions from y2038 patches

  These are two regression fixes for bugs that got introduced during the
  system call rework that went into linux-5.1 but only bisected and
  fixed now:

   - One patch affects semtimedop() on many of the less common 32-bit
     architectures, this just needs a single-line bugfix.

   - The other affects only sparc64 and has a slightly more invasive
     workaround to apply the same change to sparc64 that was done to the
     generic code used everywhere else"

* tag 'ipc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  ipc: fix sparc64 ipc() wrapper
  ipc: fix semtimedop for generic 32-bit architectures
parents 56037cad fb377eb8
...@@ -336,23 +336,26 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second ...@@ -336,23 +336,26 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second
{ {
long err; long err;
if (!IS_ENABLED(CONFIG_SYSVIPC))
return -ENOSYS;
/* No need for backward compatibility. We can start fresh... */ /* No need for backward compatibility. We can start fresh... */
if (call <= SEMTIMEDOP) { if (call <= SEMTIMEDOP) {
switch (call) { switch (call) {
case SEMOP: case SEMOP:
err = sys_semtimedop(first, ptr, err = ksys_semtimedop(first, ptr,
(unsigned int)second, NULL); (unsigned int)second, NULL);
goto out; goto out;
case SEMTIMEDOP: case SEMTIMEDOP:
err = sys_semtimedop(first, ptr, (unsigned int)second, err = ksys_semtimedop(first, ptr, (unsigned int)second,
(const struct __kernel_timespec __user *) (const struct __kernel_timespec __user *)
(unsigned long) fifth); (unsigned long) fifth);
goto out; goto out;
case SEMGET: case SEMGET:
err = sys_semget(first, (int)second, (int)third); err = ksys_semget(first, (int)second, (int)third);
goto out; goto out;
case SEMCTL: { case SEMCTL: {
err = sys_semctl(first, second, err = ksys_old_semctl(first, second,
(int)third | IPC_64, (int)third | IPC_64,
(unsigned long) ptr); (unsigned long) ptr);
goto out; goto out;
...@@ -365,18 +368,18 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second ...@@ -365,18 +368,18 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second
if (call <= MSGCTL) { if (call <= MSGCTL) {
switch (call) { switch (call) {
case MSGSND: case MSGSND:
err = sys_msgsnd(first, ptr, (size_t)second, err = ksys_msgsnd(first, ptr, (size_t)second,
(int)third); (int)third);
goto out; goto out;
case MSGRCV: case MSGRCV:
err = sys_msgrcv(first, ptr, (size_t)second, fifth, err = ksys_msgrcv(first, ptr, (size_t)second, fifth,
(int)third); (int)third);
goto out; goto out;
case MSGGET: case MSGGET:
err = sys_msgget((key_t)first, (int)second); err = ksys_msgget((key_t)first, (int)second);
goto out; goto out;
case MSGCTL: case MSGCTL:
err = sys_msgctl(first, (int)second | IPC_64, ptr); err = ksys_old_msgctl(first, (int)second | IPC_64, ptr);
goto out; goto out;
default: default:
err = -ENOSYS; err = -ENOSYS;
...@@ -396,13 +399,13 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second ...@@ -396,13 +399,13 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second
goto out; goto out;
} }
case SHMDT: case SHMDT:
err = sys_shmdt(ptr); err = ksys_shmdt(ptr);
goto out; goto out;
case SHMGET: case SHMGET:
err = sys_shmget(first, (size_t)second, (int)third); err = ksys_shmget(first, (size_t)second, (int)third);
goto out; goto out;
case SHMCTL: case SHMCTL:
err = sys_shmctl(first, (int)second | IPC_64, ptr); err = ksys_old_shmctl(first, (int)second | IPC_64, ptr);
goto out; goto out;
default: default:
err = -ENOSYS; err = -ENOSYS;
......
...@@ -1402,4 +1402,23 @@ static inline unsigned int ksys_personality(unsigned int personality) ...@@ -1402,4 +1402,23 @@ static inline unsigned int ksys_personality(unsigned int personality)
return old; return old;
} }
/* for __ARCH_WANT_SYS_IPC */
long ksys_semtimedop(int semid, struct sembuf __user *tsops,
unsigned int nsops,
const struct __kernel_timespec __user *timeout);
long ksys_semget(key_t key, int nsems, int semflg);
long ksys_old_semctl(int semid, int semnum, int cmd, unsigned long arg);
long ksys_msgget(key_t key, int msgflg);
long ksys_old_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
long ksys_msgrcv(int msqid, struct msgbuf __user *msgp, size_t msgsz,
long msgtyp, int msgflg);
long ksys_msgsnd(int msqid, struct msgbuf __user *msgp, size_t msgsz,
int msgflg);
long ksys_shmget(key_t key, size_t size, int shmflg);
long ksys_shmdt(char __user *shmaddr);
long ksys_old_shmctl(int shmid, int cmd, struct shmid_ds __user *buf);
long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems,
unsigned int nsops,
const struct old_timespec32 __user *timeout);
#endif #endif
...@@ -569,7 +569,7 @@ __SYSCALL(__NR_semget, sys_semget) ...@@ -569,7 +569,7 @@ __SYSCALL(__NR_semget, sys_semget)
__SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl) __SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl)
#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32 #if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
#define __NR_semtimedop 192 #define __NR_semtimedop 192
__SC_COMP(__NR_semtimedop, sys_semtimedop, sys_semtimedop_time32) __SC_3264(__NR_semtimedop, sys_semtimedop_time32, sys_semtimedop)
#endif #endif
#define __NR_semop 193 #define __NR_semop 193
__SYSCALL(__NR_semop, sys_semop) __SYSCALL(__NR_semop, sys_semop)
......
...@@ -276,29 +276,7 @@ static inline int compat_ipc_parse_version(int *cmd) ...@@ -276,29 +276,7 @@ static inline int compat_ipc_parse_version(int *cmd)
*cmd &= ~IPC_64; *cmd &= ~IPC_64;
return version; return version;
} }
#endif
/* for __ARCH_WANT_SYS_IPC */
long ksys_semtimedop(int semid, struct sembuf __user *tsops,
unsigned int nsops,
const struct __kernel_timespec __user *timeout);
long ksys_semget(key_t key, int nsems, int semflg);
long ksys_old_semctl(int semid, int semnum, int cmd, unsigned long arg);
long ksys_msgget(key_t key, int msgflg);
long ksys_old_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
long ksys_msgrcv(int msqid, struct msgbuf __user *msgp, size_t msgsz,
long msgtyp, int msgflg);
long ksys_msgsnd(int msqid, struct msgbuf __user *msgp, size_t msgsz,
int msgflg);
long ksys_shmget(key_t key, size_t size, int shmflg);
long ksys_shmdt(char __user *shmaddr);
long ksys_old_shmctl(int shmid, int cmd, struct shmid_ds __user *buf);
/* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */
long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems,
unsigned int nsops,
const struct old_timespec32 __user *timeout);
#ifdef CONFIG_COMPAT
long compat_ksys_old_semctl(int semid, int semnum, int cmd, int arg); long compat_ksys_old_semctl(int semid, int semnum, int cmd, int arg);
long compat_ksys_old_msgctl(int msqid, int cmd, void __user *uptr); long compat_ksys_old_msgctl(int msqid, int cmd, void __user *uptr);
long compat_ksys_msgrcv(int msqid, compat_uptr_t msgp, compat_ssize_t msgsz, long compat_ksys_msgrcv(int msqid, compat_uptr_t msgp, compat_ssize_t msgsz,
...@@ -306,6 +284,7 @@ long compat_ksys_msgrcv(int msqid, compat_uptr_t msgp, compat_ssize_t msgsz, ...@@ -306,6 +284,7 @@ long compat_ksys_msgrcv(int msqid, compat_uptr_t msgp, compat_ssize_t msgsz,
long compat_ksys_msgsnd(int msqid, compat_uptr_t msgp, long compat_ksys_msgsnd(int msqid, compat_uptr_t msgp,
compat_ssize_t msgsz, int msgflg); compat_ssize_t msgsz, int msgflg);
long compat_ksys_old_shmctl(int shmid, int cmd, void __user *uptr); long compat_ksys_old_shmctl(int shmid, int cmd, void __user *uptr);
#endif /* CONFIG_COMPAT */
#endif
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment