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

[PATCH] FUTEX_WAKE_OP: enhanced error handling

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 <dwg@au1.ibm.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jamie Lokier <jamie@shareable.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

David Gibson and committed by
Linus Torvalds
796f8d9b d55b5fda

+5
+5
kernel/futex.c
··· 365 365 if (bh1 != bh2) 366 366 spin_unlock(&bh2->lock); 367 367 368 + if (unlikely(op_ret != -EFAULT)) { 369 + ret = op_ret; 370 + goto out; 371 + } 372 + 368 373 /* futex_atomic_op_inuser needs to both read and write 369 374 * *(int __user *)uaddr2, but we can't modify it 370 375 * non-atomically. Therefore, if get_user below is not