Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bbb6cad authored by Mimi Zohar's avatar Mimi Zohar Committed by Al Viro
Browse files

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: default avatarEric Paris <eparis@redhat.com>
Acked-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 54bb6552

fs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -1736,7 +1736,7 @@ struct file *do_filp_open(int dfd, const char *pathname, 
		if (nd.root.mnt)

			path_put(&nd.root);

		if (!IS_ERR(filp)) {

			error = ima_path_check(filp, acc_mode);

			error = ima_file_check(filp, acc_mode);

			if (error) {

				fput(filp);

				filp = ERR_PTR(error);
@@ -1796,7 +1796,7 @@ struct file *do_filp_open(int dfd, const char *pathname, 
	}

	filp = nameidata_to_filp(&nd);

	if (!IS_ERR(filp)) {

		error = ima_path_check(filp, acc_mode);

		error = ima_file_check(filp, acc_mode);

		if (error) {

			fput(filp);

			filp = ERR_PTR(error);

fs/nfsd/vfs.c

+1 −1
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, 
			    flags, current_cred());

	if (IS_ERR(*filp))

		host_err = PTR_ERR(*filp);

	host_err = ima_path_check(*filp, access);

	host_err = ima_file_check(*filp, access);

out_nfserr:

	err = nfserrno(host_err);

out:

include/linux/ima.h

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct linux_binprm; 
extern int ima_bprm_check(struct linux_binprm *bprm);

extern int ima_inode_alloc(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 int ima_file_mmap(struct file *file, unsigned long prot);

extern void ima_counts_get(struct file *file);
@@ -38,7 +38,7 @@ static inline void ima_inode_free(struct inode *inode) 
	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;

}

security/integrity/ima/ima_main.c

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 *

 * File: ima_main.c

 *	implements the IMA hooks: ima_bprm_check, ima_file_mmap,

 *	and ima_path_check.

 *	and ima_file_check.

 */

#include <linux/module.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.

 * (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;
@@ -315,7 +315,7 @@ int ima_path_check(struct file *file, int mask) 
				 PATH_CHECK);

	return 0;

}

EXPORT_SYMBOL_GPL(ima_path_check);

EXPORT_SYMBOL_GPL(ima_file_check);



static int __init init_ima(void)

{