Skip to content

Commit

Permalink
waitid(): Avoid unbalanced user_access_end() on access_ok() error
Browse files Browse the repository at this point in the history
As pointed out by Linus and David, the earlier waitid() fix resulted in
a (currently harmless) unbalanced user_access_end() call.  This fixes it
to just directly return EFAULT on access_ok() failure.

Fixes: 96ca579 ("waitid(): Add missing access_ok() checks")
Acked-by: David Daney <david.daney@cavium.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
kees authored and torvalds committed Oct 20, 2017
1 parent 9a27ded commit 1c9fec4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions kernel/exit.c
Original file line number Diff line number Diff line change
Expand Up @@ -1611,7 +1611,7 @@ SYSCALL_DEFINE5(waitid, int, which, pid_t, upid, struct siginfo __user *,
return err;

if (!access_ok(VERIFY_WRITE, infop, sizeof(*infop)))
goto Efault;
return -EFAULT;

user_access_begin();
unsafe_put_user(signo, &infop->si_signo, Efault);
Expand Down Expand Up @@ -1739,7 +1739,7 @@ COMPAT_SYSCALL_DEFINE5(waitid,
return err;

if (!access_ok(VERIFY_WRITE, infop, sizeof(*infop)))
goto Efault;
return -EFAULT;

user_access_begin();
unsafe_put_user(signo, &infop->si_signo, Efault);
Expand Down

0 comments on commit 1c9fec4

Please sign in to comment.