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>

diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index 069a4aa63e950bf9a89511dfde9f53c05c0045e5..48aa0d46d3e72e5b3ec0e5f011b4caf5f337ed77 100644 (file)
--- 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 33d46859753acbb0e9bc43eec77cf8d52007a3bb..f0d60e754b3ed033e80838697467d9e54f01a0b9 100644 (file)
--- 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 df65212960516759910f4723603ff8c80d722678..60b047e96f4e9681892b39e1430c36cc492a1230 100644 (file)
--- 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;