diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2010-02-15 18:07:39 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-02-20 00:47:31 -0500 |
| commit | aeaa5ccd6421fbf9e7ded0ac67b12ea2b9fcf51e (patch) | |
| tree | f614a33edbd3daab32d616446eb45a526e68d21b /fs | |
| parent | 4e70af56319e56423d6eb1ce25fc321cdf8cd41d (diff) | |
| download | linux-3.10-aeaa5ccd6421fbf9e7ded0ac67b12ea2b9fcf51e.tar.gz linux-3.10-aeaa5ccd6421fbf9e7ded0ac67b12ea2b9fcf51e.tar.bz2 linux-3.10-aeaa5ccd6421fbf9e7ded0ac67b12ea2b9fcf51e.zip | |
vfs: don't call ima_file_check() unconditionally in nfsd_open()
commit 1e41568d7378d1ba8c64ba137b9ddd00b59f893a ("Take ima_path_check()
in nfsd past dentry_open() in nfsd_open()") moved this code back to its
original location but missed the "else".
Signed-off-by: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -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 97d79eff6b7..8715d194561 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -752,7 +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_file_check(*filp, access); + else + host_err = ima_file_check(*filp, access); out_nfserr: err = nfserrno(host_err); out: |