Skip to content

Commit

Permalink
vfs: don't call ima_file_check() unconditionally in nfsd_open()
Browse files Browse the repository at this point in the history
commit 1e41568 ("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>
  • Loading branch information
Chuck Ebbert authored and Al Viro committed Feb 20, 2010
1 parent 4e70af5 commit aeaa5cc
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fs/nfsd/vfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit aeaa5cc

Please sign in to comment.