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

Commit d9d300cd authored by Dmitry Kasatkin's avatar Dmitry Kasatkin Committed by Mimi Zohar
Browse files

ima: rename ima_must_appraise_or_measure 



When AUDIT action support is added to the IMA,
ima_must_appraise_or_measure() does not reflect the real meaning anymore.
Rename it to ima_get_action().

Signed-off-by: default avatarDmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
parent e23eb920

security/integrity/ima/ima.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static inline unsigned long ima_hash_key(u8 *digest) 
}



/* LIM API function definitions */

int ima_must_appraise_or_measure(struct inode *inode, int mask, int function);

int ima_get_action(struct inode *inode, int mask, int function);

int ima_must_measure(struct inode *inode, int mask, int function);

int ima_collect_measurement(struct integrity_iint_cache *iint,

			    struct file *file);

security/integrity/ima/ima_api.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename, 
}



/**

 * ima_must_appraise_or_measure - appraise & measure decision based on policy.

 * ima_get_action - appraise & measure decision based on policy.

 * @inode: pointer to inode to measure

 * @mask: contains the permission mask (MAY_READ, MAY_WRITE, MAY_EXECUTE)

 * @function: calling function (FILE_CHECK, BPRM_CHECK, FILE_MMAP)
@@ -112,7 +112,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename, 
 * Returns IMA_MEASURE, IMA_APPRAISE mask.

 *

 */

int ima_must_appraise_or_measure(struct inode *inode, int mask, int function)

int ima_get_action(struct inode *inode, int mask, int function)

{

	int flags = IMA_MEASURE | IMA_APPRAISE;

security/integrity/ima/ima_main.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int process_measurement(struct file *file, const unsigned char *filename, 


	/* Determine if in appraise/measurement policy,

	 * returns IMA_MEASURE, IMA_APPRAISE bitmask.  */

	action = ima_must_appraise_or_measure(inode, mask, function);

	action = ima_get_action(inode, mask, function);

	if (!action)

		return 0;