summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorDmitry Kasatkin <dmitry.kasatkin@intel.com>2012-06-27 11:26:14 +0300
committerMimi Zohar <zohar@linux.vnet.ibm.com>2012-09-12 07:28:05 -0400
commitd9d300cdb6f233c4c591348919c758062198a4f4 (patch)
tree2a00e8e9100b1d799e5b779008ad0081e7fe5264 /security
parente23eb920b0f3978687c497de2ac3eb9e281dab32 (diff)
downloadlinux-3.10-d9d300cdb6f233c4c591348919c758062198a4f4.tar.gz
linux-3.10-d9d300cdb6f233c4c591348919c758062198a4f4.tar.bz2
linux-3.10-d9d300cdb6f233c4c591348919c758062198a4f4.zip
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: Dmitry Kasatkin <dmitry.kasatkin@intel.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima.h2
-rw-r--r--security/integrity/ima/ima_api.c4
-rw-r--r--security/integrity/ima/ima_main.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index 069a4aa63e9..48aa0d46d3e 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -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);
diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
index 33d46859753..f0d60e754b3 100644
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
@@ -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
* @mask: contains the permission mask (MAY_READ, MAY_WRITE, MAY_EXECUTE)
* @function: calling function (FILE_CHECK, BPRM_CHECK, FILE_MMAP)
@@ -112,7 +112,7 @@ err_out:
* 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;
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index df652129605..60b047e96f4 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -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;