Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d9d300cdb6f233c4c591348919c758062198a4f4

Authored by Dmitry Kasatkin
Committed by Mimi Zohar
1 parent e23eb920b0
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 3 changed files with 4 additions and 4 deletions Side-by-side Diff

security/integrity/ima/ima.h
Diff comments   View file @ d9d300c
... ... @@ -108,7 +108,7 @@
108 108 }
109 109  
110 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 112 int ima_must_measure(struct inode *inode, int mask, int function);
113 113 int ima_collect_measurement(struct integrity_iint_cache *iint,
114 114 struct file *file);
security/integrity/ima/ima_api.c
Diff comments   View file @ d9d300c
... ... @@ -97,7 +97,7 @@
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 101 * @inode: pointer to inode to measure
102 102 * @mask: contains the permission mask (MAY_READ, MAY_WRITE, MAY_EXECUTE)
103 103 * @function: calling function (FILE_CHECK, BPRM_CHECK, FILE_MMAP)
... ... @@ -112,7 +112,7 @@
112 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 117 int flags = IMA_MEASURE | IMA_APPRAISE;
118 118  
security/integrity/ima/ima_main.c
Diff comments   View file @ d9d300c
... ... @@ -158,7 +158,7 @@
158 158  
159 159 /* Determine if in appraise/measurement policy,
160 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 162 if (!action)
163 163 return 0;
164 164