| Message ID | 20200205103317.29356-4-roberto.sassu@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ima: support stronger algorithms for attestation | expand |
> -----Original Message----- > From: Roberto Sassu > Sent: Wednesday, February 5, 2020 11:33 AM > To: zohar@linux.ibm.com; James.Bottomley@HansenPartnership.com; > jarkko.sakkinen@linux.intel.com > Cc: linux-integrity@vger.kernel.org; linux-security-module@vger.kernel.org; > linux-kernel@vger.kernel.org; Silviu Vlasceanu > <Silviu.Vlasceanu@huawei.com>; Roberto Sassu > <roberto.sassu@huawei.com> > Subject: [PATCH v2 3/8] ima: Evaluate error in init_ima() > > Evaluate error in init_ima() before register_blocking_lsm_notifier() and > return if not zero. > > Fixes: b16942455193 ("ima: use the lsm policy update notifier") > Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> Add in CC stable@vger.kernel.org. Roberto HUAWEI TECHNOLOGIES Duesseldorf GmbH, HRB 56063 Managing Director: Li Peng, Li Jian, Shi Yanli > --- > security/integrity/ima/ima_main.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/security/integrity/ima/ima_main.c > b/security/integrity/ima/ima_main.c > index d7e987baf127..a16c148ed90d 100644 > --- a/security/integrity/ima/ima_main.c > +++ b/security/integrity/ima/ima_main.c > @@ -738,6 +738,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); > -- > 2.17.1
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index d7e987baf127..a16c148ed90d 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -738,6 +738,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);
Evaluate error in init_ima() before register_blocking_lsm_notifier() and return if not zero. Fixes: b16942455193 ("ima: use the lsm policy update notifier") Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> --- security/integrity/ima/ima_main.c | 3 +++ 1 file changed, 3 insertions(+)