Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm64: fix building without CONFIG_UID16

As reported by Michal Simek, building an ARM64 kernel with CONFIG_UID16
disabled currently fails because the system call table still needs to
reference the individual function entry points that are provided by
kernel/sys_ni.c in this case, and the declarations are hidden inside
of #ifdef CONFIG_UID16:

arch/arm64/include/asm/unistd32.h:57:8: error: 'sys_lchown16' undeclared here (not in a function)
__SYSCALL(__NR_lchown, sys_lchown16)

I believe this problem only exists on ARM64, because older architectures
tend to not need declarations when their system call table is built
in assembly code, while newer architectures tend to not need UID16
support. ARM64 only uses these system calls for compatibility with
32-bit ARM binaries.

This changes the CONFIG_UID16 check into CONFIG_HAVE_UID16, which is
set unconditionally on ARM64 with CONFIG_COMPAT, so we see the
declarations whenever we need them, but otherwise the behavior is
unchanged.

Fixes: af1839eb4bd4 ("Kconfig: clean up the long arch list for the UID16 config option")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

authored by

Arnd Bergmann and committed by
Catalin Marinas
fbc416ff 7142392d

+2 -2
+1 -1
include/linux/syscalls.h
··· 524 524 asmlinkage long sys_lchown(const char __user *filename, 525 525 uid_t user, gid_t group); 526 526 asmlinkage long sys_fchown(unsigned int fd, uid_t user, gid_t group); 527 - #ifdef CONFIG_UID16 527 + #ifdef CONFIG_HAVE_UID16 528 528 asmlinkage long sys_chown16(const char __user *filename, 529 529 old_uid_t user, old_gid_t group); 530 530 asmlinkage long sys_lchown16(const char __user *filename,
+1 -1
include/linux/types.h
··· 35 35 36 36 typedef unsigned long uintptr_t; 37 37 38 - #ifdef CONFIG_UID16 38 + #ifdef CONFIG_HAVE_UID16 39 39 /* This is defined by include/asm-{arch}/posix_types.h */ 40 40 typedef __kernel_old_uid_t old_uid_t; 41 41 typedef __kernel_old_gid_t old_gid_t;