FUTEX_WAKE_OP weirdness
Linus/Andrew, please apply.
The code for FUTEX_WAKE_OP calls an arch callback, futex_atomic_op_inuser(). That callback can return an error code, but currently the caller assumes any error is EFAULT, and will try various things to resolve the fault before eventually giving up with EFAULT (regardless of the original error code). This is not a theoretical case - arch callbacks currently return -ENOSYS if the opcode they are given is bogus.
This patch alters the code to detect non-EFAULT errors and return them directly to the user.
Of course, whether -ENOSYS is the correct return value for the bogus opcode case, or whether EINVAL would be more appropriate is another question.
Signed-off-by David Gibson <[email protected]>
kernel/futex.c +5 -0
@@ -365,6 +365,11 @@if (bh1 != bh2)spin_unlock (&bh2->lock); +if (unlikely (op_ret != -EFAULT )) { + ret = op_ret; + goto out; + } +/* futex_atomic_op_inuser needs to both read and write * *(int __user *)uaddr2, but we can't modify it * non-atomically. Therefore, if get_user below is not
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/people/dgibson