leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ima: rename ima_must_appraise_or_measure

Browse Source 
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: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
This commit is contained in:
Dmitry Kasatkin 2012-06-27 11:26:14 +03:00 committed by Mimi Zohar
parent e23eb920b0
commit d9d300cdb6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/integrity/ima/ima.h
View File

@ -108,7 +108,7 @@ static inline unsigned long ima_hash_key(u8 *digest)
} }
/* LIM API function definitions */ /* 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_must_measure(struct inode *inode, int mask, int function);
int ima_collect_measurement(struct integrity_iint_cache *iint, int ima_collect_measurement(struct integrity_iint_cache *iint,
struct file *file); struct file *file);

4
security/integrity/ima/ima_api.c
View File

@ -97,7 +97,7 @@ err_out:
} }
/** /**
* 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 * @inode: pointer to inode to measure
* @mask: contains the permission mask (MAY_READ, MAY_WRITE, MAY_EXECUTE) * @mask: contains the permission mask (MAY_READ, MAY_WRITE, MAY_EXECUTE)
* @function: calling function (FILE_CHECK, BPRM_CHECK, FILE_MMAP) * @function: calling function (FILE_CHECK, BPRM_CHECK, FILE_MMAP)
@ -112,7 +112,7 @@ err_out:
* Returns IMA_MEASURE, IMA_APPRAISE mask. * 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; int flags = IMA_MEASURE | IMA_APPRAISE;

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

@ -158,7 +158,7 @@ static int process_measurement(struct file *file, const unsigned char *filename,
/* Determine if in appraise/measurement policy, /* Determine if in appraise/measurement policy,
* returns IMA_MEASURE, IMA_APPRAISE bitmask. */ * returns IMA_MEASURE, IMA_APPRAISE bitmask. */
action = ima_must_appraise_or_measure(inode, mask, function); action = ima_get_action(inode, mask, function);
if (!action) if (!action)
return 0; return 0;