diff options
| -rw-r--r-- | security/integrity/ima/ima.h | 2 | ||||
| -rw-r--r-- | security/integrity/ima/ima_api.c | 4 | ||||
| -rw-r--r-- | security/integrity/ima/ima_main.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 069a4aa63e95..48aa0d46d3e7 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) | |||
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | /* LIM API function definitions */ | 110 | /* LIM API function definitions */ |
| 111 | int ima_must_appraise_or_measure(struct inode *inode, int mask, int function); | 111 | int ima_get_action(struct inode *inode, int mask, int function); |
| 112 | int ima_must_measure(struct inode *inode, int mask, int function); | 112 | int ima_must_measure(struct inode *inode, int mask, int function); |
| 113 | int ima_collect_measurement(struct integrity_iint_cache *iint, | 113 | int ima_collect_measurement(struct integrity_iint_cache *iint, |
| 114 | struct file *file); | 114 | struct file *file); |
diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c index 33d46859753a..f0d60e754b3e 100644 --- a/security/integrity/ima/ima_api.c +++ b/security/integrity/ima/ima_api.c | |||
| @@ -97,7 +97,7 @@ err_out: | |||
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | /** | 99 | /** |
| 100 | * ima_must_appraise_or_measure - appraise & measure decision based on policy. | 100 | * ima_get_action - appraise & measure decision based on policy. |
| 101 | * @inode: pointer to inode to measure | 101 | * @inode: pointer to inode to measure |
| 102 | * @mask: contains the permission mask (MAY_READ, MAY_WRITE, MAY_EXECUTE) | 102 | * @mask: contains the permission mask (MAY_READ, MAY_WRITE, MAY_EXECUTE) |
| 103 | * @function: calling function (FILE_CHECK, BPRM_CHECK, FILE_MMAP) | 103 | * @function: calling function (FILE_CHECK, BPRM_CHECK, FILE_MMAP) |
| @@ -112,7 +112,7 @@ err_out: | |||
| 112 | * Returns IMA_MEASURE, IMA_APPRAISE mask. | 112 | * Returns IMA_MEASURE, IMA_APPRAISE mask. |
| 113 | * | 113 | * |
| 114 | */ | 114 | */ |
| 115 | int ima_must_appraise_or_measure(struct inode *inode, int mask, int function) | 115 | int ima_get_action(struct inode *inode, int mask, int function) |
| 116 | { | 116 | { |
| 117 | int flags = IMA_MEASURE | IMA_APPRAISE; | 117 | int flags = IMA_MEASURE | IMA_APPRAISE; |
| 118 | 118 | ||
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index df6521296051..60b047e96f4e 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, | |||
| 158 | 158 | ||
| 159 | /* Determine if in appraise/measurement policy, | 159 | /* Determine if in appraise/measurement policy, |
| 160 | * returns IMA_MEASURE, IMA_APPRAISE bitmask. */ | 160 | * returns IMA_MEASURE, IMA_APPRAISE bitmask. */ |
| 161 | action = ima_must_appraise_or_measure(inode, mask, function); | 161 | action = ima_get_action(inode, mask, function); |
| 162 | if (!action) | 162 | if (!action) |
| 163 | return 0; | 163 | return 0; |
| 164 | 164 | ||
