aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/namei.c4
-rw-r--r--fs/nfsd/vfs.c2
-rw-r--r--include/linux/ima.h4
-rw-r--r--security/integrity/ima/ima_main.c6
4 files changed, 8 insertions, 8 deletions
diff --git a/fs/namei.c b/fs/namei.c
index cd77b6375efd..d62fdc875f22 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1736,7 +1736,7 @@ do_last:
1736 if (nd.root.mnt) 1736 if (nd.root.mnt)
1737 path_put(&nd.root); 1737 path_put(&nd.root);
1738 if (!IS_ERR(filp)) { 1738 if (!IS_ERR(filp)) {
1739 error = ima_path_check(filp, acc_mode); 1739 error = ima_file_check(filp, acc_mode);
1740 if (error) { 1740 if (error) {
1741 fput(filp); 1741 fput(filp);
1742 filp = ERR_PTR(error); 1742 filp = ERR_PTR(error);
@@ -1796,7 +1796,7 @@ ok:
1796 } 1796 }
1797 filp = nameidata_to_filp(&nd); 1797 filp = nameidata_to_filp(&nd);
1798 if (!IS_ERR(filp)) { 1798 if (!IS_ERR(filp)) {
1799 error = ima_path_check(filp, acc_mode); 1799 error = ima_file_check(filp, acc_mode);
1800 if (error) { 1800 if (error) {
1801 fput(filp); 1801 fput(filp);
1802 filp = ERR_PTR(error); 1802 filp = ERR_PTR(error);
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 32477e3a645c..97d79eff6b7f 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -752,7 +752,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
752 flags, current_cred()); 752 flags, current_cred());
753 if (IS_ERR(*filp)) 753 if (IS_ERR(*filp))
754 host_err = PTR_ERR(*filp); 754 host_err = PTR_ERR(*filp);
755 host_err = ima_path_check(*filp, access); 755 host_err = ima_file_check(*filp, access);
756out_nfserr: 756out_nfserr:
757 err = nfserrno(host_err); 757 err = nfserrno(host_err);
758out: 758out:
diff --git a/include/linux/ima.h b/include/linux/ima.h
index aa55a8f1f5b9..975837e7d6c0 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -17,7 +17,7 @@ struct linux_binprm;
17extern int ima_bprm_check(struct linux_binprm *bprm); 17extern int ima_bprm_check(struct linux_binprm *bprm);
18extern int ima_inode_alloc(struct inode *inode); 18extern int ima_inode_alloc(struct inode *inode);
19extern void ima_inode_free(struct inode *inode); 19extern void ima_inode_free(struct inode *inode);
20extern int ima_path_check(struct file *file, int mask); 20extern int ima_file_check(struct file *file, int mask);
21extern void ima_file_free(struct file *file); 21extern void ima_file_free(struct file *file);
22extern int ima_file_mmap(struct file *file, unsigned long prot); 22extern int ima_file_mmap(struct file *file, unsigned long prot);
23extern void ima_counts_get(struct file *file); 23extern void ima_counts_get(struct file *file);
@@ -38,7 +38,7 @@ static inline void ima_inode_free(struct inode *inode)
38 return; 38 return;
39} 39}
40 40
41static inline int ima_path_check(struct file *file, int mask) 41static inline int ima_file_check(struct file *file, int mask)
42{ 42{
43 return 0; 43 return 0;
44} 44}
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index eb1cf6498cc9..b76e1f03ea2b 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -14,7 +14,7 @@
14 * 14 *
15 * File: ima_main.c 15 * File: ima_main.c
16 * implements the IMA hooks: ima_bprm_check, ima_file_mmap, 16 * implements the IMA hooks: ima_bprm_check, ima_file_mmap,
17 * and ima_path_check. 17 * and ima_file_check.
18 */ 18 */
19#include <linux/module.h> 19#include <linux/module.h>
20#include <linux/file.h> 20#include <linux/file.h>
@@ -306,7 +306,7 @@ int ima_bprm_check(struct linux_binprm *bprm)
306 * Always return 0 and audit dentry_open failures. 306 * Always return 0 and audit dentry_open failures.
307 * (Return code will be based upon measurement appraisal.) 307 * (Return code will be based upon measurement appraisal.)
308 */ 308 */
309int ima_path_check(struct file *file, int mask) 309int ima_file_check(struct file *file, int mask)
310{ 310{
311 int rc; 311 int rc;
312 312
@@ -315,7 +315,7 @@ int ima_path_check(struct file *file, int mask)
315 PATH_CHECK); 315 PATH_CHECK);
316 return 0; 316 return 0;
317} 317}
318EXPORT_SYMBOL_GPL(ima_path_check); 318EXPORT_SYMBOL_GPL(ima_file_check);
319 319
320static int __init init_ima(void) 320static int __init init_ima(void)
321{ 321{