diff options
author | Kees Cook <keescook@chromium.org> | 2012-08-27 14:38:13 -0400 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2012-09-07 11:06:14 -0400 |
commit | 2e4930eb7c8fb20a39dfb5f8a8f80402710dcea8 (patch) | |
tree | 01e5e84032b2d7efe3441080e5ce1c484f696680 /security | |
parent | c6993e4ac002c92bc75379212e9179c36d4bf7ee (diff) |
Yama: handle 32-bit userspace prctl
When running a 64-bit kernel and receiving prctls from a 32-bit
userspace, the "-1" used as an unsigned long will end up being
misdetected. The kernel is looking for 0xffffffffffffffff instead of
0xffffffff. Since prctl lacks a distinct compat interface, Yama needs
to handle this translation itself. As such, support either value as
meaning PR_SET_PTRACER_ANY, to avoid breaking the ABI for 64-bit.
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: John Johansen <john.johansen@canonical.com>
Cc: stable@vger.kernel.org
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/yama/yama_lsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c index 9ca43c1ea630..01d3b44b62c1 100644 --- a/security/yama/yama_lsm.c +++ b/security/yama/yama_lsm.c | |||
@@ -143,7 +143,7 @@ int yama_task_prctl(int option, unsigned long arg2, unsigned long arg3, | |||
143 | if (arg2 == 0) { | 143 | if (arg2 == 0) { |
144 | yama_ptracer_del(NULL, myself); | 144 | yama_ptracer_del(NULL, myself); |
145 | rc = 0; | 145 | rc = 0; |
146 | } else if (arg2 == PR_SET_PTRACER_ANY) { | 146 | } else if (arg2 == PR_SET_PTRACER_ANY || (int)arg2 == -1) { |
147 | rc = yama_ptracer_add(NULL, myself); | 147 | rc = yama_ptracer_add(NULL, myself); |
148 | } else { | 148 | } else { |
149 | struct task_struct *tracer; | 149 | struct task_struct *tracer; |