diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-01-26 05:43:08 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-02-07 03:06:22 -0500 |
| commit | 1e41568d7378d1ba8c64ba137b9ddd00b59f893a (patch) | |
| tree | 755987f08fe2cc44dbdac089eb18a21ec844f179 | |
| parent | 4b06e5b9ad8abb20105b2b25e42c509ebe9b2d76 (diff) | |
| download | op-kernel-dev-1e41568d7378d1ba8c64ba137b9ddd00b59f893a.zip op-kernel-dev-1e41568d7378d1ba8c64ba137b9ddd00b59f893a.tar.gz | |
Take ima_path_check() in nfsd past dentry_open() in nfsd_open()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/nfsd/vfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index c194793..325959e 100644 --- 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; } |
