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

Commit 657a03ff authored by Roberto Sassu's avatar Roberto Sassu Committed by Greg Kroah-Hartman
Browse files

ima: Fix return value of ima_write_policy() 



[ Upstream commit 2e3a34e9f409ebe83d1af7cd2f49fca7af97dfac ]

This patch fixes the return value of ima_write_policy() when a new policy
is directly passed to IMA and the current policy requires appraisal of the
file containing the policy. Currently, if appraisal is not in ENFORCE mode,
ima_write_policy() returns 0 and leads user space applications to an
endless loop. Fix this issue by denying the operation regardless of the
appraisal mode.

Cc: stable@vger.kernel.org # 4.10.x
Fixes: 19f8a847 ("ima: measure and appraise the IMA policy itself")
Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Reviewed-by: default avatarKrzysztof Struczynski <krzysztof.struczynski@huawei.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4c7a2e76

security/integrity/ima/ima_fs.c

+1 −2
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ static ssize_t ima_write_policy(struct file *file, const char __user *buf, 
		integrity_audit_msg(AUDIT_INTEGRITY_STATUS, NULL, NULL,

				    "policy_update", "signed policy required",

				    1, 0);

		if (ima_appraise & IMA_APPRAISE_ENFORCE)

		result = -EACCES;

	} else {

		result = ima_parse_add_rule(data);