ipc: fix semtimedop for generic 32-bit architectures
Subsystems (4)
Arnd Bergmann
maintainerPATCH 1/2 ipc: fix semtimedop for generic 32-bit architectures
As Vincent noticed, the y2038 conversion of semtimedop in linux-5.1 broke when commit 00bf25d693e7 ("y2038: use time32 syscall names on 32-bit") changed all system calls on all architectures that take a 32-bit time_t to point to the _time32 implementation, but left out semtimedop in the asm-generic header.
This affects all 32-bit architectures using asm-generic/unistd.h:
h8300, unicore32, openrisc, nios2, hexagon, c6x, arc, nds32 and csky.
The notable exception is riscv32, which has dropped support for the time32 system calls entirely.
---
Hi Vincent,
Sorry for the delay since your report. Does this address your problem?
Anyone else, please note that this patch is required since 5.1 to make sysvipc work on the listed architectures.
--- include/uapi/asm-generic/unistd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/asm-generic/unistd.h +1 -1
@@ -569,7 +569,7 @@ __SYSCALL(__NR_semget, sys_semget) __SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl)#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG !=32 #define __NR_semtimedop 192 -__SC_COMP(__NR_semtimedop, sys_semtimedop, sys_semtimedop_time32) +__SC_3264(__NR_semtimedop, sys_semtimedop_time32, sys_semtimedop)#endif #define __NR_semop 193__SYSCALL (__NR_semop, sys_semop)
Signature · 1 line
2.20.0
Arnd Bergmann
maintainerPATCH 2/2 ipc: fix sparc64 ipc() wrapper
Matt bisected a sparc64 specific issue with semctl, shmctl and msgctl to a commit from my y2038 series in linux-5.1, as I missed the custom sys_ipc() wrapper that sparc64 uses in place of the generic version that I patched.
The problem is that the sys_{sem,shm,msg}ctl() functions in the kernel now do not allow being called with the IPC_64 flag any more, resulting in a -EINVAL error when they don't recognize the command.
Instead, the correct way to do this now is to call the internal ksys_old_{sem,shm,msg}ctl() functions to select the API version.
As we generally move towards these functions anyway, change all of sparc_ipc() to consistently use those in place of the sys_*() versions, and move the required ksys_*() declarations into linux/syscalls.h
---
Hi Matt,
Can you check that this solves your problem?
--- arch/sparc/kernel/sys_sparc_64.c | 30 +++++++++++++++--------------- include/linux/syscalls.h | 19 +++++++++++++++++++ ipc/util.h | 25 ++----------------------- 3 files changed, 36 insertions(+), 38 deletions(-)
arch/sparc/kernel/sys_sparc_64.c +15 -15
@@ -340,21 +340,21 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, secondif (call <=SEMTIMEDOP ) {switch (call) {case SEMOP : - err =sys_semtimedop (first, ptr, - (unsigned int )second,NULL ); + err =ksys_semtimedop (first, ptr, + (unsigned int )second,NULL ); goto out;case SEMTIMEDOP : - err =sys_semtimedop (first, ptr, (unsigned int )second, + err =ksys_semtimedop (first, ptr, (unsigned int )second, (const struct __kernel_timespec __user *) - (unsigned long ) fifth); + (unsigned long ) fifth); goto out;case SEMGET : - err =sys_semget (first, (int )second, (int )third); + err =ksys_semget (first, (int )second, (int )third); goto out;case SEMCTL : { - err =sys_semctl (first, second, - (int )third |IPC_64 , - (unsigned long ) ptr); + err =ksys_old_semctl (first, second, + (int )third |IPC_64 , + (unsigned long ) ptr); goto out; }default :
@@ -365,18 +365,18 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, secondif (call <=MSGCTL ) {switch (call) {case MSGSND : - err =sys_msgsnd (first, ptr, (size_t )second, + err =ksys_msgsnd (first, ptr, (size_t )second, (int )third); goto out;case MSGRCV : - err =sys_msgrcv (first, ptr, (size_t )second, fifth, + err =ksys_msgrcv (first, ptr, (size_t )second, fifth, (int )third); goto out;case MSGGET : - err =sys_msgget ((key_t )first, (int )second); + err =ksys_msgget ((key_t )first, (int )second); goto out;case MSGCTL : - err =sys_msgctl (first, (int )second |IPC_64 , ptr); + err =ksys_old_msgctl (first, (int )second |IPC_64 , ptr); goto out;default : err = -ENOSYS ;
@@ -396,13 +396,13 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second goto out; }case SHMDT : - err =sys_shmdt (ptr); + err =ksys_shmdt (ptr); goto out;case SHMGET : - err =sys_shmget (first, (size_t )second, (int )third); + err =ksys_shmget (first, (size_t )second, (int )third); goto out;case SHMCTL : - err =sys_shmctl (first, (int )second |IPC_64 , ptr); + err =ksys_old_shmctl (first, (int )second |IPC_64 , ptr); goto out;default : err = -ENOSYS ;
include/linux/syscalls.h +19 -0
@@ -1402,4 +1402,23 @@ static inline unsigned int ksys_personality(unsigned int personality) 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
ipc/util.h +2 -23
@@ -276,29 +276,7 @@ static inline int compat_ipc_parse_version(int *cmd) *cmd &= ~IPC_64 ;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_msgctl (int msqid,int cmd,void __user *uptr); 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,compat_ssize_t msgsz,int msgflg);long compat_ksys_old_shmctl (int shmid,int cmd,void __user *uptr); -#endif /* CONFIG_COMPAT */ + +#endif #endif
Signature · 1 line
2.20.0
Re: [PATCH 2/2] ipc: fix sparc64 ipc() wrapper
Quoted 17 lines · Arnd Bergmann
Matt bisected a sparc64 specific issue with semctl, shmctl and msgctl to a commit from my y2038 series in linux-5.1, as I missed the custom
sys_ipc()wrapper that sparc64 uses in place of the generic version that I patched.The problem is that the sys_{sem,shm,msg}ctl() functions in the kernel now do not allow being called with the
IPC_64flag any more, resulting in a-EINVALerror when they don't recognize the command.Instead, the correct way to do this now is to call the internal ksys_old_{sem,shm,msg}ctl() functions to select the API version.
As we generally move towards these functions anyway, change all of
sparc_ipc()to consistently use those in place of the sys_*() versions, and move the required ksys_*() declarations intolinux/syscalls.h
Quoted 8 lines
Reported-by Matt Turner <[email protected]>Fixes 275f22148e87 ("ipc: rename old-style shmctl/semctl/msgctl syscalls")Signed-off-by Arnd Bergmann <[email protected]>---
Hi Matt,Can you check that this solves your problem?
Works great. Thank you Arnd!
Re: [PATCH 2/2] ipc: fix sparc64 ipc() wrapper
In reply to Arnd BergmannQuoted 13 lines · Arnd Bergmann
Matt bisected a sparc64 specific issue with semctl, shmctl and msgctl to a commit from my y2038 series in linux-5.1, as I missed the custom
sys_ipc()wrapper that sparc64 uses in place of the generic version that I patched.The problem is that the sys_{sem,shm,msg}ctl() functions in the kernel now do not allow being called with the
IPC_64flag any more, resulting in a-EINVALerror when they don't recognize the command.Instead, the correct way to do this now is to call the internal ksys_old_{sem,shm,msg}ctl() functions to select the API version.
Quoted 8 lines
As we generally move towards these functions anyway, change all of
sparc_ipc()to consistently use those in place of the sys_*() versions, and move the required ksys_*() declarations intolinux/syscalls.hReported-by Matt Turner <[email protected]>Fixes 275f22148e87 ("ipc: rename old-style shmctl/semctl/msgctl syscalls")Signed-off-by Arnd Bergmann <[email protected]>
Not Matt,
but this patch fixes util-linux.git ipcs test-suite (make check) regression for me on current sparc64 git kernel (5.3.0-rc7), which was broken somewhere in between 4.19 (debian unstable kernel) and 5.3-rcX.
Thanks!
PS: wanted to bisect kernel, but Matt did it first.
Arnd Bergmann
maintainerRe: [PATCH 2/2] ipc: fix sparc64 ipc() wrapper
In reply to Arnd Bergmannarch/sparc/kernel/sys_sparc_64.c SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second · line 345
Quoted 13 lines · Arnd Bergmann
arch/sparc/kernel/sys_sparc_64.c +2
-2@@ -340,21 +340,21 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, secondif (call <=SEMTIMEDOP ) {switch (call) {case SEMOP : - err =sys_semtimedop (first, ptr, - (unsigned int )second,NULL ); + err =ksys_semtimedop (first, ptr, + (unsigned int )second,NULL ); goto out;
The zero-day bot found a link error in sparc64 allnoconfig:
arch/sparc/kernel/sys_sparc_64.o: In function `__se_sys_sparc_ipc':
Quoted 7 lines
Quoted 7 lines
sys_sparc_64.c:(.text+0x724): undefined reference to
ksys_semtimedop' sys_sparc_64.c:(.text+0x76c): undefined reference toksys_old_msgctl' sys_sparc_64.c:(.text+0x7a8): undefined reference toksys_semget' sys_sparc_64.c:(.text+0x7c8): undefined reference toksys_old_semctl' sys_sparc_64.c:(.text+0x7e4): undefined reference toksys_msgsnd' sys_sparc_64.c:(.text+0x7fc): undefined reference toksys_shmget' sys_sparc_64.c:(.text+0x808): undefined reference to `ksys_shmdt'
sys_sparc_64.c:(.text+0x828): undefined reference to `ksys_semtimedop'
Quoted 3 lines
Quoted 3 lines
sys_sparc_64.c:(.text+0x844): undefined reference to
ksys_old_shmctl' sys_sparc_64.c:(.text+0x858): undefined reference toksys_msgget' sys_sparc_64.c:(.text+0x86c): undefined reference to `ksys_msgrcv'
I've added this hunk to my patch and plan to send both fixes to Linus in the next few days, after I get a positive report from the bot as well:
arch/sparc/kernel/sys_sparc_64.c +0 -0
@@ -336,6 +336,9 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call,
int, first, unsigned long, second
{
long err;+ if (!IS_ENABLED(CONFIG_SYSVIPC))
+ return -ENOSYS;
+
/* No need for backward compatibility. We can start fresh... */
if (call <= SEMTIMEDOP) {
switch (call) {_______________________________________________
Y2038 mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/y2038