| Message ID | 1514389304-27870-1-git-send-email-minyard@acm.org |
|---|---|
| State | New |
| Headers | show |
| Series | Revert "ipmi_si: fix memory leak on new_smi" | expand |
On Wed, Dec 27, 2017 at 09:41:44AM -0600, minyard@acm.org wrote: > From: Corey Minyard <cminyard@mvista.com> > > This reverts commit c97e41076a298dbc4e910c33048e553658388eed. > > A backport was requested of c0a32fe13cd32 "ipmi_si: fix memory leak on > new_smi", but the backport shouldn't have been done. This change needs > to be reverted, as it can result in an oops and the previous code is > correct. > > Reverts: c97e41076a29 ("ipmi_si: fix memory leak on new_smi") > Link: https://bbs.archlinux.org/viewtopic.php?pid=1757130#p1757130 > Reported-by: Neil Romig <neil@sixtythree.me.uk> > Cc: Sasha Levin <alexander.levin@verizon.com> > Signed-off-by: Corey Minyard <cminyard@mvista.com> > --- > > This is for 4.14 stable tree only. In hindsight, I should scrutinize > stable kernel requests from others in the IPMI tree. Sorry about that. I just queued this patch up from someone else already. Thanks for it, and sorry for the problems. greg k-h > > drivers/char/ipmi/ipmi_si_intf.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c > index e1cbb78..c04aa11 100644 > --- a/drivers/char/ipmi/ipmi_si_intf.c > +++ b/drivers/char/ipmi/ipmi_si_intf.c > @@ -3469,7 +3469,6 @@ static int add_smi(struct smi_info *new_smi) > ipmi_addr_src_to_str(new_smi->addr_source), > si_to_str[new_smi->si_type]); > rv = -EBUSY; > - kfree(new_smi); > goto out_err; > } > } > -- > 2.7.4
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index e1cbb78..c04aa11 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -3469,7 +3469,6 @@ static int add_smi(struct smi_info *new_smi) ipmi_addr_src_to_str(new_smi->addr_source), si_to_str[new_smi->si_type]); rv = -EBUSY; - kfree(new_smi); goto out_err; } }