ima: rename ima_path_check to ima_file_check

ima_path_check actually deals with files! call it ima_file_check instead.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

authored by Mimi Zohar and committed by Al Viro 9bbb6cad 54bb6552

+8 -8
+2 -2
fs/namei.c
··· 1736 1736 if (nd.root.mnt) 1737 1737 path_put(&nd.root); 1738 1738 if (!IS_ERR(filp)) { 1739 - error = ima_path_check(filp, acc_mode); 1739 + error = ima_file_check(filp, acc_mode); 1740 1740 if (error) { 1741 1741 fput(filp); 1742 1742 filp = ERR_PTR(error); ··· 1796 1796 } 1797 1797 filp = nameidata_to_filp(&nd); 1798 1798 if (!IS_ERR(filp)) { 1799 - error = ima_path_check(filp, acc_mode); 1799 + error = ima_file_check(filp, acc_mode); 1800 1800 if (error) { 1801 1801 fput(filp); 1802 1802 filp = ERR_PTR(error);
+1 -1
fs/nfsd/vfs.c
··· 752 752 flags, current_cred()); 753 753 if (IS_ERR(*filp)) 754 754 host_err = PTR_ERR(*filp); 755 - host_err = ima_path_check(*filp, access); 755 + host_err = ima_file_check(*filp, access); 756 756 out_nfserr: 757 757 err = nfserrno(host_err); 758 758 out:
+2 -2
include/linux/ima.h
··· 17 17 extern int ima_bprm_check(struct linux_binprm *bprm); 18 18 extern int ima_inode_alloc(struct inode *inode); 19 19 extern void ima_inode_free(struct inode *inode); 20 - extern int ima_path_check(struct file *file, int mask); 20 + extern int ima_file_check(struct file *file, int mask); 21 21 extern void ima_file_free(struct file *file); 22 22 extern int ima_file_mmap(struct file *file, unsigned long prot); 23 23 extern void ima_counts_get(struct file *file); ··· 38 38 return; 39 39 } 40 40 41 - static inline int ima_path_check(struct file *file, int mask) 41 + static inline int ima_file_check(struct file *file, int mask) 42 42 { 43 43 return 0; 44 44 }
+3 -3
security/integrity/ima/ima_main.c
··· 14 14 * 15 15 * File: ima_main.c 16 16 * implements the IMA hooks: ima_bprm_check, ima_file_mmap, 17 - * and ima_path_check. 17 + * and ima_file_check. 18 18 */ 19 19 #include <linux/module.h> 20 20 #include <linux/file.h> ··· 306 306 * Always return 0 and audit dentry_open failures. 307 307 * (Return code will be based upon measurement appraisal.) 308 308 */ 309 - int ima_path_check(struct file *file, int mask) 309 + int ima_file_check(struct file *file, int mask) 310 310 { 311 311 int rc; 312 312 ··· 315 315 PATH_CHECK); 316 316 return 0; 317 317 } 318 - EXPORT_SYMBOL_GPL(ima_path_check); 318 + EXPORT_SYMBOL_GPL(ima_file_check); 319 319 320 320 static int __init init_ima(void) 321 321 {