From: Corey Minyard <cminyard@mvista.com>
Date: Wed, 20 Jun 2018 12:19:01 +0000 (-0500)
Subject: ipmi: Cleanup oops on initialization failure
X-Git-Tag: v4.18-rc4~12^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2068db53b6337f8c6c7bcd07dea0b5e82b1a1a02;p=thirdparty%2Fkernel%2Flinux.git

ipmi: Cleanup oops on initialization failure

Commit 93c303d2045b3 "ipmi_si: Clean up shutdown a bit" didn't
copy the behavior of the cleanup in one spot, it needed to
check for a non-NULL interface before cleaning it up.

Reported-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Tested-by: Meelis Roos <mroos@linux.ee>
---

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index ad353be871bf0..90ec010bffbd9 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2088,8 +2088,10 @@ static int try_smi_init(struct smi_info *new_smi)
 	return 0;
 
 out_err:
-	ipmi_unregister_smi(new_smi->intf);
-	new_smi->intf = NULL;
+	if (new_smi->intf) {
+		ipmi_unregister_smi(new_smi->intf);
+		new_smi->intf = NULL;
+	}
 
 	kfree(init_name);