ima: simplify conditional statement to improve performance

Precede bit testing before string comparison makes code
faster. Also refactor statement as a single line pointer
assignment. Logic is following: we set 'xattr_ptr' to read
xattr value when we will do appraisal or in any case when
measurement template is other than 'ima'.

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>

diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index f82cf9b..f7b85bf 100644 (file)
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -206,10 +206,8 @@ static int process_measurement(struct file *file, const char *filename,
        }
 
        template_desc = ima_template_desc_current();
-       if (strcmp(template_desc->name, IMA_TEMPLATE_IMA_NAME) == 0) {
-               if (action & IMA_APPRAISE_SUBMASK)
-                       xattr_ptr = &xattr_value;
-       } else
+       if ((action & IMA_APPRAISE_SUBMASK) ||
+                   strcmp(template_desc->name, IMA_TEMPLATE_IMA_NAME) != 0)
                xattr_ptr = &xattr_value;
 
        rc = ima_collect_measurement(iint, file, xattr_ptr, &xattr_len);