commit 1e41568d7378d1ba8c64ba137b9ddd00b59f893a
author Al Viro <viro@zeniv.linux.org.uk> Tue Jan 26 05:43:08 2010 -0500
committer Al Viro <viro@zeniv.linux.org.uk> Sun Feb 07 03:06:22 2010 -0500
tree 755987f08fe2cc44dbdac089eb18a21ec844f179
parent 4b06e5b9ad8abb20105b2b25e42c509ebe9b2d76

Take ima_path_check() in nfsd past dentry_open() in nfsd_open()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/nfsd/vfs.c

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 @@
 			    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 @@
 	 */
 	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;
 }