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

Configure Feed

Select the types of activity you want to include in your feed.

waitid(): Avoid unbalanced user_access_end() on access_ok() error

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: 96ca579a1ecc ("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>

authored by

Kees Cook and committed by
Linus Torvalds 1c9fec47 9a27ded2

+2 -2
+2 -2
kernel/exit.c
··· 1611 1611 return err; 1612 1612 1613 1613 if (!access_ok(VERIFY_WRITE, infop, sizeof(*infop))) 1614 - goto Efault; 1614 + return -EFAULT; 1615 1615 1616 1616 user_access_begin(); 1617 1617 unsafe_put_user(signo, &infop->si_signo, Efault); ··· 1739 1739 return err; 1740 1740 1741 1741 if (!access_ok(VERIFY_WRITE, infop, sizeof(*infop))) 1742 - goto Efault; 1742 + return -EFAULT; 1743 1743 1744 1744 user_access_begin(); 1745 1745 unsafe_put_user(signo, &infop->si_signo, Efault);