diff mbox series

[4.19,v2,4/5] ima: Evaluate error in init_ima()

Message ID 20230216124227.44058-5-guozihua@huawei.com (mailing list archive)
State Handled Elsewhere
Headers show
Series Backport handling -ESTALE policy update failure to 4.19 | expand

Commit Message

Guozihua (Scott) Feb. 16, 2023, 12:42 p.m. UTC 
From: Roberto Sassu <roberto.sassu@huawei.com>

[ Upstream commit e144d6b265415ddbdc54b3f17f4f95133effa5a8 ]

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>
Signed-off-by: GUO Zihua <guozihua@huawei.com>
---
 security/integrity/ima/ima_main.c | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 55681872c6ce..fcaaf2c2ba4b 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -557,6 +557,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);