projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4b06e5b
)
Take ima_path_check() in nfsd past dentry_open() in nfsd_open()
author
Al Viro
<viro@zeniv.linux.org.uk>
Tue, 26 Jan 2010 10:43:08 +0000
(
05:43
-0500)
committer
Al Viro
<viro@zeniv.linux.org.uk>
Sun, 7 Feb 2010 08:06:22 +0000
(
03:06
-0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/nfsd/vfs.c
patch
|
blob
|
history
diff --git
a/fs/nfsd/vfs.c
b/fs/nfsd/vfs.c
index
c194793
..
325959e
100644
(file)
--- a/
fs/nfsd/vfs.c
+++ b/
fs/nfsd/vfs.c
@@
-752,6
+752,8
@@
nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
flags, current_cred());
if (IS_ERR(*filp))
host_err = PTR_ERR(*filp);
+ host_err = ima_path_check(&(*filp)->f_path,
+ access & (MAY_READ | MAY_WRITE | MAY_EXEC));
out_nfserr:
err = nfserrno(host_err);
out:
@@
-2127,7
+2129,6
@@
nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp,
*/
path.mnt = exp->ex_path.mnt;
path.dentry = dentry;
- err = ima_path_check(&path, acc & (MAY_READ | MAY_WRITE | MAY_EXEC));
nfsd_out:
return err? nfserrno(err) : 0;
}