syscalls: fix sys_fanotify_mark prototype
PATCH 1/1 syscalls: fix sys_fanotify_mark prototype
From: Arnd Bergmann <[email protected]>
My earlier fix missed an incorrect function prototype that shows up on native 32-bit builds:
In file included from fs/notify/fanotify/fanotify_user.c:14:include/linux/syscalls.h:248:25: error: conflicting types for 'sys_fanotify_mark'; have 'long int(int, unsigned int, u32, u32, int, const char *)' {aka 'long int(int, unsigned int, unsigned int, unsigned int, int, const char *)'}
1924 | SYSCALL32_DEFINE6(fanotify_mark,
| ^~~~~~~~~~~~~~~~~
include/linux/syscalls.h:862:17: note: previous declaration of 'sys_fanotify_mark' with type 'long int(int, unsigned int, u64, int, const char *)' {aka 'long int(int, unsigned int, long long unsigned int, int, const char *)'}
On x86 and powerpc, the prototype is also wrong but hidden in an #ifdef, so it never caused problems.
Add another alternative declaration that matches the conditional function definition.
---
I've queued this fix in the asm-generic tree now
include/linux/syscalls.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/linux/syscalls.h +6 -0
@@ -859,9 +859,15 @@ asmlinkage long sys_prlimit64(pid_t pid, unsigned int resource,const struct rlimit64 __user *new_rlim, struct rlimit64 __user *old_rlim);asmlinkage long sys_fanotify_init (unsigned int flags,unsigned int event_f_flags); +#if defined(CONFIG_ARCH_SPLIT_ARG64 ) +asmlinkage long sys_fanotify_mark (int fanotify_fd,unsigned int flags, +unsigned int mask_1,unsigned int mask_2, +int dfd,const char __user * pathname); +#else asmlinkage long sys_fanotify_mark (int fanotify_fd,unsigned int flags,u64 mask,int fd,const char __user *pathname); +#endif asmlinkage long sys_name_to_handle_at (int dfd,const char __user *name,struct file_handle __user *handle,int __user *mnt_id,int flag);
Signature · 1 line
2.39.2
Quoted 14 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
My earlier fix missed an incorrect function prototype that shows up on native 32-bit builds:
In file included from
fs/notify/fanotify/fanotify_user.c:14:include/linux/syscalls.h:248:25: error: conflicting types for 'sys_fanotify_mark'; have 'longint(int, unsigned int, u32, u32, int, const char *)' {aka 'longint(int, unsigned int, unsigned int, unsigned int, int, const char *)'}
1924 | SYSCALL32_DEFINE6(fanotify_mark,| ^~~~~~~~~~~~~~~~~
include/linux/syscalls.h:862:17: note: previous declaration of 'sys_fanotify_mark' with type 'longint(int, unsigned int, u64, int, const char *)' {aka 'longint(int, unsigned int, long long unsigned int, int, const char *)'}On x86 and powerpc, the prototype is also wrong but hidden in an #ifdef, so it never caused problems.
Quoted 6 lines
Add another alternative declaration that matches the conditional function definition.
Fixes 403f17a33073 ("parisc: use generic sys_fanotify_mark implementation")Reported-by Guenter Roeck <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>
Guenter, thanks for noticing!
Arnd, I can confirm this patch fixes the 32-bit build for hppa, so you may add:
Thank you!
Helge
Quoted 26 lines
---
I've queued this fix in the asm-generic tree nowinclude/linux/syscalls.h | 6 ++++++ 1 file changed, 6 insertions(+)include/linux/syscalls.h +6
-0@@ -859,9 +859,15 @@ asmlinkage long sys_prlimit64(pid_t pid, unsigned int resource,const struct rlimit64 __user *new_rlim, struct rlimit64 __user *old_rlim);asmlinkage long sys_fanotify_init (unsigned int flags,unsigned int event_f_flags); +#if defined(CONFIG_ARCH_SPLIT_ARG64 ) +asmlinkage long sys_fanotify_mark (int fanotify_fd,unsigned int flags, +unsigned int mask_1,unsigned int mask_2, +int dfd,const char __user * pathname); +#else asmlinkage long sys_fanotify_mark (int fanotify_fd,unsigned int flags,u64 mask,int fd,const char __user *pathname); +#endif asmlinkage long sys_name_to_handle_at (int dfd,const char __user *name,struct file_handle __user *handle,int __user *mnt_id,int flag);