summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/vpe.c
diff options
context:
space:
mode:
authorJames Morris2008-12-25 01:40:09 +0100
committerJames Morris2008-12-25 01:40:09 +0100
commitcbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch)
tree90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /arch/mips/kernel/vpe.c
parentLinux 2.6.28 (diff)
parentSELinux: don't check permissions for kernel mounts (diff)
downloadkernel-qcow2-linux-cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db.tar.gz
kernel-qcow2-linux-cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db.tar.xz
kernel-qcow2-linux-cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/mips/kernel/vpe.c')
-rw-r--r--arch/mips/kernel/vpe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index a1b3da6bad5c..010b27e01f7b 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1085,8 +1085,8 @@ static int vpe_open(struct inode *inode, struct file *filp)
v->load_addr = NULL;
v->len = 0;
- v->uid = filp->f_uid;
- v->gid = filp->f_gid;
+ v->uid = filp->f_cred->fsuid;
+ v->gid = filp->f_cred->fsgid;
#ifdef CONFIG_MIPS_APSP_KSPD
/* get kspd to tell us when a syscall_exit happens */