diff options
author | Amanieu d'Antras <amanieu@gmail.com> | 2015-08-06 15:46:29 -0700 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2015-09-03 16:47:12 +0100 |
commit | 1f1fa26a761b975a29aa302249db0fbc1c8a29bd (patch) | |
tree | c0f9da3e5ac1287d7f8ba58e5e83a87a1100fc4b | |
parent | 3a6d9db06bb0ac48b2e6df4f3d1db0e133733118 (diff) | |
download | linux-stable-1f1fa26a761b975a29aa302249db0fbc1c8a29bd.tar.gz linux-stable-1f1fa26a761b975a29aa302249db0fbc1c8a29bd.tar.bz2 linux-stable-1f1fa26a761b975a29aa302249db0fbc1c8a29bd.zip |
signal: fix information leak in copy_siginfo_to_user
commit 26135022f85105ad725cda103fa069e29e83bd16 upstream.
This function may copy the si_addr_lsb, si_lower and si_upper fields to
user mode when they haven't been initialized, which can leak kernel
stack data to user mode.
Just checking the value of si_code is insufficient because the same
si_code value is shared between multiple signals. This is solved by
checking the value of si_signo in addition to si_code.
Signed-off-by: Amanieu d'Antras <amanieu@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[ luis: backported to 3.16:
- dropped 2nd hunk in kernel/signal.c ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
-rw-r--r-- | arch/arm64/kernel/signal32.c | 3 | ||||
-rw-r--r-- | kernel/signal.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c index 070de43fb3b5..bf32174fe11f 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -168,7 +168,8 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from) * Other callers might not initialize the si_lsb field, * so check explicitely for the right codes here. */ - if (from->si_code == BUS_MCEERR_AR || from->si_code == BUS_MCEERR_AO) + if (from->si_signo == SIGBUS && + (from->si_code == BUS_MCEERR_AR || from->si_code == BUS_MCEERR_AO)) err |= __put_user(from->si_addr_lsb, &to->si_addr_lsb); #endif break; diff --git a/kernel/signal.c b/kernel/signal.c index a4077e90f19f..11fa21958bf1 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2745,7 +2745,8 @@ int copy_siginfo_to_user(siginfo_t __user *to, const siginfo_t *from) * Other callers might not initialize the si_lsb field, * so check explicitly for the right codes here. */ - if (from->si_code == BUS_MCEERR_AR || from->si_code == BUS_MCEERR_AO) + if (from->si_signo == SIGBUS && + (from->si_code == BUS_MCEERR_AR || from->si_code == BUS_MCEERR_AO)) err |= __put_user(from->si_addr_lsb, &to->si_addr_lsb); #endif break; |