fs/signalfd.c: Fix inconsistent return codes for signalfd4
PATCH v2 1/1 fs/signalfd.c: Fix inconsistent return codes for signalfd4
The kernel signalfd4() syscall returns different error codes when called either in compat or native mode. This behaviour makes correct emulation in qemu and testing programs like LTP more complicated.
Fix the code to always return -in both modes- EFAULT for unaccessible user memory, and EINVAL when called with an invalid signal mask.
Signed-off-by Helge Deller <[email protected]>
---
Changelog v2:
- Rephrased commit message.
fs/signalfd.c +6 -4
@@ -314,9 +314,10 @@ SYSCALL_DEFINE4(signalfd4, int, ufd, sigset_t __user *, user_mask, {sigset_t mask; -if (sizemask !=sizeof (sigset_t) || -copy_from_user (&mask, user_mask,sizeof (mask))) +if (sizemask !=sizeof (sigset_t))return -EINVAL ; +if (copy_from_user (&mask, user_mask,sizeof (mask))) +return -EFAULT ;return do_signalfd4 (ufd, &mask, flags); }
@@ -325,9 +326,10 @@ SYSCALL_DEFINE3(signalfd, int, ufd, sigset_t __user *, user_mask, {sigset_t mask; -if (sizemask !=sizeof (sigset_t) || -copy_from_user (&mask, user_mask,sizeof (mask))) +if (sizemask !=sizeof (sigset_t))return -EINVAL ; +if (copy_from_user (&mask, user_mask,sizeof (mask))) +return -EFAULT ;return do_signalfd4 (ufd, &mask,0 ); }