lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ima: rename ima_path_check to ima_file_check

Browse Source 
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>
This commit is contained in:
Mimi Zohar
2010-01-26 17:02:40 -05:00
committed by Al Viro
parent 54bb6552bd
commit 9bbb6cad01
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/namei.c
View File

@@ -1736,7 +1736,7 @@ do_last:
if (nd.root.mnt) if (nd.root.mnt)
path_put(&nd.root); path_put(&nd.root);
if (!IS_ERR(filp)) { if (!IS_ERR(filp)) {
error = ima_path_check(filp, acc_mode); error = ima_file_check(filp, acc_mode);
if (error) { if (error) {
fput(filp); fput(filp);
filp = ERR_PTR(error); filp = ERR_PTR(error);
@@ -1796,7 +1796,7 @@ ok:
} }
filp = nameidata_to_filp(&nd); filp = nameidata_to_filp(&nd);
if (!IS_ERR(filp)) { if (!IS_ERR(filp)) {
error = ima_path_check(filp, acc_mode); error = ima_file_check(filp, acc_mode);
if (error) { if (error) {
fput(filp); fput(filp);
filp = ERR_PTR(error); filp = ERR_PTR(error);

2
fs/nfsd/vfs.c
View File

@@ -752,7 +752,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
flags, current_cred()); flags, current_cred());
if (IS_ERR(*filp)) if (IS_ERR(*filp))
host_err = PTR_ERR(*filp); host_err = PTR_ERR(*filp);
host_err = ima_path_check(*filp, access); host_err = ima_file_check(*filp, access);
out_nfserr: out_nfserr:
err = nfserrno(host_err); err = nfserrno(host_err);
out: out:

4
include/linux/ima.h
View File

@@ -17,7 +17,7 @@ struct linux_binprm;
extern int ima_bprm_check(struct linux_binprm *bprm); extern int ima_bprm_check(struct linux_binprm *bprm);
extern int ima_inode_alloc(struct inode *inode); extern int ima_inode_alloc(struct inode *inode);
extern void ima_inode_free(struct inode *inode); extern void ima_inode_free(struct inode *inode);
extern int ima_path_check(struct file *file, int mask); extern int ima_file_check(struct file *file, int mask);
extern void ima_file_free(struct file *file); extern void ima_file_free(struct file *file);
extern int ima_file_mmap(struct file *file, unsigned long prot); extern int ima_file_mmap(struct file *file, unsigned long prot);
extern void ima_counts_get(struct file *file); extern void ima_counts_get(struct file *file);
@@ -38,7 +38,7 @@ static inline void ima_inode_free(struct inode *inode)
return; return;
} }
static inline int ima_path_check(struct file *file, int mask) static inline int ima_file_check(struct file *file, int mask)
{ {
return 0; return 0;
} }

6
security/integrity/ima/ima_main.c
View File

@@ -14,7 +14,7 @@
* *
* File: ima_main.c * File: ima_main.c
* implements the IMA hooks: ima_bprm_check, ima_file_mmap, * implements the IMA hooks: ima_bprm_check, ima_file_mmap,
* and ima_path_check. * and ima_file_check.
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/file.h> #include <linux/file.h>
@@ -306,7 +306,7 @@ int ima_bprm_check(struct linux_binprm *bprm)
* Always return 0 and audit dentry_open failures. * Always return 0 and audit dentry_open failures.
* (Return code will be based upon measurement appraisal.) * (Return code will be based upon measurement appraisal.)
*/ */
int ima_path_check(struct file *file, int mask) int ima_file_check(struct file *file, int mask)
{ {
int rc; int rc;
@@ -315,7 +315,7 @@ int ima_path_check(struct file *file, int mask)
PATH_CHECK); PATH_CHECK);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ima_path_check); EXPORT_SYMBOL_GPL(ima_file_check);
static int __init init_ima(void) static int __init init_ima(void)
{ {