diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-08 10:00:08 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-03 06:28:38 -0400 |
commit | 078de5f706ece36afd73bb4b8283314132d2dfdf (patch) | |
tree | 0dee00713f9cb5e2516260a66b8df99ef7d03e4d /arch/x86/mm | |
parent | ae2975bc3476243b45a1e2344236d7920c268f38 (diff) |
userns: Store uid and gid values in struct cred with kuid_t and kgid_t types
cred.h and a few trivial users of struct cred are changed. The rest of the users
of struct cred are left for other patches as there are too many changes to make
in one go and leave the change reviewable. If the user namespace is disabled and
CONFIG_UIDGID_STRICT_TYPE_CHECKS are disabled the code will contiue to compile
and behave correctly.
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 3ecfd1aaf214..76dcd9d8e0bc 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
@@ -582,7 +582,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code, | |||
582 | pte_t *pte = lookup_address(address, &level); | 582 | pte_t *pte = lookup_address(address, &level); |
583 | 583 | ||
584 | if (pte && pte_present(*pte) && !pte_exec(*pte)) | 584 | if (pte && pte_present(*pte) && !pte_exec(*pte)) |
585 | printk(nx_warning, current_uid()); | 585 | printk(nx_warning, from_kuid(&init_user_ns, current_uid())); |
586 | } | 586 | } |
587 | 587 | ||
588 | printk(KERN_ALERT "BUG: unable to handle kernel "); | 588 | printk(KERN_ALERT "BUG: unable to handle kernel "); |