summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-08-07 03:59:47 -0700
committerEric W. Biederman <ebiederm@xmission.com>2012-09-21 03:13:28 -0700
commit9e184e0aa386099c8a78f4f04f882a57ac11d8fc (patch)
treed879e762d889e886b01db8750e6ef14c75ad7e2c
parent558a4479d9df64062520e529613885bfbac55472 (diff)
downloadop-kernel-dev-9e184e0aa386099c8a78f4f04f882a57ac11d8fc.zip
op-kernel-dev-9e184e0aa386099c8a78f4f04f882a57ac11d8fc.tar.gz
userns: On ppc convert current_uid from a kuid before printing.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-rw-r--r--arch/powerpc/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 08ffcf5..e5f028b 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -470,7 +470,7 @@ bad_area_nosemaphore:
if (is_exec && (error_code & DSISR_PROTFAULT))
printk_ratelimited(KERN_CRIT "kernel tried to execute NX-protected"
" page (%lx) - exploit attempt? (uid: %d)\n",
- address, current_uid());
+ address, from_kuid(&init_user_ns, current_uid()));
return SIGSEGV;
OpenPOWER on IntegriCloud