From: Roberto Sassu <roberto.sassu@huawei.com>
Date: Wed, 25 Mar 2020 10:47:07 +0000 (+0100)
Subject: ima: Evaluate error in init_ima()
X-Git-Tag: v5.15~3586^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e144d6b265415ddbdc54b3f17f4f95133effa5a8;p=platform%2Fkernel%2Flinux-starfive.git

ima: Evaluate error in init_ima()

Evaluate error in init_ima() before register_blocking_lsm_notifier() and
return if not zero.

Cc: stable@vger.kernel.org # 5.3.x
Fixes: b16942455193 ("ima: use the lsm policy update notifier")
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Reviewed-by: James Morris <jamorris@linux.microsoft.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
---

diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 9d0abed..f96f151 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -792,6 +792,9 @@ static int __init init_ima(void)
 		error = ima_init();
 	}
 
+	if (error)
+		return error;
+
 	error = register_blocking_lsm_notifier(&ima_lsm_policy_notifier);
 	if (error)
 		pr_warn("Couldn't register LSM notifier, error %d\n", error);