aboutsummaryrefslogtreecommitdiffstats
path: root/security/yama
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-08-27 11:38:13 -0700
committerJames Morris <james.l.morris@oracle.com>2012-09-08 01:06:14 +1000
commit2e4930eb7c8fb20a39dfb5f8a8f80402710dcea8 (patch)
tree01e5e84032b2d7efe3441080e5ce1c484f696680 /security/yama
parentsecurity: allow Yama to be unconditionally stacked (diff)
downloadlinux-dev-2e4930eb7c8fb20a39dfb5f8a8f80402710dcea8.tar.xz
linux-dev-2e4930eb7c8fb20a39dfb5f8a8f80402710dcea8.zip
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/yama')
-rw-r--r--security/yama/yama_lsm.c2
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,
if (arg2 == 0) {
yama_ptracer_del(NULL, myself);
rc = 0;
- } else if (arg2 == PR_SET_PTRACER_ANY) {
+ } else if (arg2 == PR_SET_PTRACER_ANY || (int)arg2 == -1) {
rc = yama_ptracer_add(NULL, myself);
} else {
struct task_struct *tracer;