diff options
author | Alex Elder | 2010-02-26 21:34:02 +0100 |
---|---|---|
committer | Alex Elder | 2010-02-26 21:34:02 +0100 |
commit | 398007f863a4af2b4a5a07219c5a617f1a098115 (patch) | |
tree | 7589f17bfa6645ee0342048bfaede1391a411f2b /fs/nfsd/vfs.c | |
parent | fs/xfs: Correct NULL test (diff) | |
parent | Linux 2.6.33 (diff) | |
download | kernel-qcow2-linux-398007f863a4af2b4a5a07219c5a617f1a098115.tar.gz kernel-qcow2-linux-398007f863a4af2b4a5a07219c5a617f1a098115.tar.xz kernel-qcow2-linux-398007f863a4af2b4a5a07219c5a617f1a098115.zip |
Merge branch 'linux-2.6.33'
Diffstat (limited to 'fs/nfsd/vfs.c')
-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 c194793b642b..8715d194561a 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); + else + host_err = ima_file_check(*filp, access); 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; } |