diff options
| author | James Morris <jmorris@namei.org> | 2008-12-25 11:40:09 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-25 11:40:09 +1100 |
| commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
| tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /arch/um/drivers | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) | |
| download | linux-cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db.tar.gz linux-cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db.tar.bz2 linux-cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/um/drivers')
| -rw-r--r-- | arch/um/drivers/mconsole_kern.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 8f44ebb0dec8..e14629c87de4 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c @@ -161,7 +161,8 @@ void mconsole_proc(struct mc_request *req) goto out_kill; } - file = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY); + file = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY, + current_cred()); if (IS_ERR(file)) { mconsole_reply(req, "Failed to open file", 1, 0); goto out_kill; |