Skip to contentSkip to conversation

ipc: Fix building compat mode without sysvipc

PATCH In review Arnd Bergmann 2 participants 3 messages Mar 6, 2019 ABI/API

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ipc: Fix building compat mode without sysvipc

As John Stultz noticed, my y2038 syscall series caused a link failure when CONFIG_SYSVIPC is enabled but CONFIG_COMPAT is enabled:

arch/arm64/kernel/sys32.o:(.rodata+0x960): undefined reference to __arm64_compat_sys_old_semctl' arch/arm64/kernel/sys32.o:(.rodata+0x980): undefined reference to __arm64_compat_sys_old_msgctl' arch/arm64/kernel/sys32.o:(.rodata+0x9a0): undefined reference to `__arm64_compat_sys_old_shmctl'

Add the missing entries in kernel/sys_ni.c for the new system calls.

Cc Laura Abbott <[email protected]>
Cc John Stultz <[email protected]>
Cc Thomas Gleixner <[email protected]>

---
I'm about to send off my pull requests for arm-soc, so I'd just send another one with just this common from my y2038 tree.

---
 kernel/sys_ni.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/sys_ni.c +3 -0
index 85e5ccec0955..62a6c8707799 100644
@@ -202,6 +202,7 @@ COND_SYSCALL(msgget);
 COND_SYSCALL(old_msgctl);
 COND_SYSCALL(msgctl);
 COND_SYSCALL_COMPAT(msgctl);
+COND_SYSCALL_COMPAT(old_msgctl);
 COND_SYSCALL(msgrcv);
 COND_SYSCALL_COMPAT(msgrcv);
 COND_SYSCALL(msgsnd);
@@ -212,6 +213,7 @@ COND_SYSCALL(semget);
 COND_SYSCALL(old_semctl);
 COND_SYSCALL(semctl);
 COND_SYSCALL_COMPAT(semctl);
+COND_SYSCALL_COMPAT(old_semctl);
 COND_SYSCALL(semtimedop);
 COND_SYSCALL(semtimedop_time32);
 COND_SYSCALL(semop);
@@ -221,6 +223,7 @@ COND_SYSCALL(shmget);
 COND_SYSCALL(old_shmctl);
 COND_SYSCALL(shmctl);
 COND_SYSCALL_COMPAT(shmctl);
+COND_SYSCALL_COMPAT(old_shmctl);
 COND_SYSCALL(shmat);
 COND_SYSCALL_COMPAT(shmat);
 COND_SYSCALL(shmdt);
Signature · 1 line
2.20.0
#1 lore raw
Quoted 4 lines · Arnd Bergmann

As John Stultz noticed, my y2038 syscall series caused a link failure when CONFIG_SYSVIPC is enabled but CONFIG_COMPAT is enabled:

is this supposed to be "CONFIG_SYSVIPC is disabled" to match the subject?

Quoted 47 lines

arch/arm64/kernel/sys32.o:(.rodata+0x960): undefined reference to __arm64_compat_sys_old_semctl' arch/arm64/kernel/sys32.o:(.rodata+0x980): undefined reference to __arm64_compat_sys_old_msgctl' arch/arm64/kernel/sys32.o:(.rodata+0x9a0): undefined reference to `__arm64_compat_sys_old_shmctl'

Add the missing entries in kernel/sys_ni.c for the new system calls.

Cc Laura Abbott <[email protected]>
Cc John Stultz <[email protected]>
Cc Thomas Gleixner <[email protected]>

---
I'm about to send off my pull requests for arm-soc, so I'd just send another one with just this common from my y2038 tree.

---
  kernel/sys_ni.c | 3 +++
  1 file changed, 3 insertions(+)
kernel/sys_ni.c +3 -0
index 85e5ccec0955..62a6c8707799 100644
@@ -202,6 +202,7 @@ COND_SYSCALL(msgget);
  COND_SYSCALL(old_msgctl);
  COND_SYSCALL(msgctl);
  COND_SYSCALL_COMPAT(msgctl);
+COND_SYSCALL_COMPAT(old_msgctl);
  COND_SYSCALL(msgrcv);
  COND_SYSCALL_COMPAT(msgrcv);
  COND_SYSCALL(msgsnd);
@@ -212,6 +213,7 @@ COND_SYSCALL(semget);
  COND_SYSCALL(old_semctl);
  COND_SYSCALL(semctl);
  COND_SYSCALL_COMPAT(semctl);
+COND_SYSCALL_COMPAT(old_semctl);
  COND_SYSCALL(semtimedop);
  COND_SYSCALL(semtimedop_time32);
  COND_SYSCALL(semop);
@@ -221,6 +223,7 @@ COND_SYSCALL(shmget);
  COND_SYSCALL(old_shmctl);
  COND_SYSCALL(shmctl);
  COND_SYSCALL_COMPAT(shmctl);
+COND_SYSCALL_COMPAT(old_shmctl);
  COND_SYSCALL(shmat);
  COND_SYSCALL_COMPAT(shmat);
  COND_SYSCALL(shmdt);
#2 lore raw
Quoted 9 lines · Laura Abbott
Quoted 4 lines · Arnd Bergmann

As John Stultz noticed, my y2038 syscall series caused a link failure when CONFIG_SYSVIPC is enabled but CONFIG_COMPAT is enabled:

is this supposed to be "CONFIG_SYSVIPC is disabled" to match the subject?

Fixing it now, thanks!

Arnd