Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f68c05f4 authored by Dmitry Kasatkin's avatar Dmitry Kasatkin Committed by Mimi Zohar
Browse files

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: default avatarDmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
parent 65d98f3b

security/integrity/ima/ima_main.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -206,10 +206,8 @@ static int process_measurement(struct file *file, const char *filename, 
	}

	}





	template_desc = ima_template_desc_current();

	template_desc = ima_template_desc_current();

	if (strcmp(template_desc->name, IMA_TEMPLATE_IMA_NAME) == 0) {

	if ((action & IMA_APPRAISE_SUBMASK) ||

		if (action & IMA_APPRAISE_SUBMASK)

		    strcmp(template_desc->name, IMA_TEMPLATE_IMA_NAME) != 0)

			xattr_ptr = &xattr_value;

	} else

		xattr_ptr = &xattr_value;

		xattr_ptr = &xattr_value;





	rc = ima_collect_measurement(iint, file, xattr_ptr, &xattr_len);

	rc = ima_collect_measurement(iint, file, xattr_ptr, &xattr_len);