Prev: [PATCH] USB: misplaced parenthesis
Next: Rebase v. merge (Was: Re: linux-next: manual merge of the xfs tree with the vfs tree)
From: Chuck Ebbert on 15 Feb 2010 18:10 From: Chuck Ebbert <cebbert(a)redhat.com> 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(a)redhat.com> --- linux-2.6.32.noarch.orig/fs/nfsd/vfs.c +++ linux-2.6.32.noarch/fs/nfsd/vfs.c @@ -752,7 +752,8 @@ nfsd_open(struct svc_rqst *rqstp, struct 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: -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |