Skip to content

Commit 89c0dc9

Browse files
arndbgregkh
authored andcommitted
parisc: use generic sys_fanotify_mark implementation
[ Upstream commit 403f17a ] The sys_fanotify_mark() syscall on parisc uses the reverse word order for the two halves of the 64-bit argument compared to all syscalls on all 32-bit architectures. As far as I can tell, the problem is that the function arguments on parisc are sorted backwards (26, 25, 24, 23, ...) compared to everyone else, so the calling conventions of using an even/odd register pair in native word order result in the lower word coming first in function arguments, matching the expected behavior on little-endian architectures. The system call conventions however ended up matching what the other 32-bit architectures do. A glibc cleanup in 2020 changed the userspace behavior in a way that handles all architectures consistently, but this inadvertently broke parisc32 by changing to the same method as everyone else. The change made it into glibc-2.35 and subsequently into debian 12 (bookworm), which is the latest stable release. This means we need to choose between reverting the glibc change or changing the kernel to match it again, but either hange will leave some systems broken. Pick the option that is more likely to help current and future users and change the kernel to match current glibc. This also means the behavior is now consistent across architectures, but it breaks running new kernels with old glibc builds before 2.35. Link: https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d150181d73d9 Link: https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/commit/arch/parisc/kernel/sys_parisc.c?h=57b1dfbd5b4a39d Cc: Adhemerval Zanella <[email protected]> Tested-by: Helge Deller <[email protected]> Acked-by: Helge Deller <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 2d07fea commit 89c0dc9

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

arch/parisc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ config PARISC
1212
select ARCH_HAS_STRICT_MODULE_RWX
1313
select ARCH_HAS_UBSAN_SANITIZE_ALL
1414
select ARCH_NO_SG_CHAIN
15+
select ARCH_SPLIT_ARG64 if !64BIT
1516
select ARCH_SUPPORTS_HUGETLBFS if PA20
1617
select ARCH_SUPPORTS_MEMORY_FAILURE
1718
select DMA_OPS

arch/parisc/kernel/sys_parisc32.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,3 @@ asmlinkage long sys32_unimplemented(int r26, int r25, int r24, int r23,
2323
current->comm, current->pid, r20);
2424
return -ENOSYS;
2525
}
26-
27-
asmlinkage long sys32_fanotify_mark(compat_int_t fanotify_fd, compat_uint_t flags,
28-
compat_uint_t mask0, compat_uint_t mask1, compat_int_t dfd,
29-
const char __user * pathname)
30-
{
31-
return sys_fanotify_mark(fanotify_fd, flags,
32-
((__u64)mask1 << 32) | mask0,
33-
dfd, pathname);
34-
}

arch/parisc/kernel/syscalls/syscall.tbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@
364364
320 common accept4 sys_accept4
365365
321 common prlimit64 sys_prlimit64
366366
322 common fanotify_init sys_fanotify_init
367-
323 common fanotify_mark sys_fanotify_mark sys32_fanotify_mark
367+
323 common fanotify_mark sys_fanotify_mark compat_sys_fanotify_mark
368368
324 32 clock_adjtime sys_clock_adjtime32
369369
324 64 clock_adjtime sys_clock_adjtime
370370
325 common name_to_handle_at sys_name_to_handle_at

0 commit comments

Comments
 (0)