From: Daniel Kurtz <djkurtz@chromium.org> To: James Liao <jamesjj.liao@mediatek.com> Cc: Matthias Brugger <matthias.bgg@gmail.com>, Mike Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@codeaurora.org>, Sascha Hauer <kernel@pengutronix.de>, srv_heupstream <srv_heupstream@mediatek.com>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "moderated list:ARM/Mediatek SoC support" <linux-mediatek@lists.infradead.org>, linux-clk@vger.kernel.org Subject: Re: [PATCH] clk: mediatek: Fix memory leak on clock init fail Date: Fri, 8 Jan 2016 16:21:18 +0800 [thread overview] Message-ID: <CAGS+omCXK4mFBz1HoDUMCPHKa5cqa4DOkbjBuratcps6nBLfig@mail.gmail.com> (raw) In-Reply-To: <1452240933-60695-1-git-send-email-jamesjj.liao@mediatek.com> On Fri, Jan 8, 2016 at 4:15 PM, James Liao <jamesjj.liao@mediatek.com> wrote: > mtk_clk_register_composite() may leak memory due to some error > handling path don't free all allocated memory. This patch > free all pointers that may allocate memory before error return. > And it's safe because kfree() can handle NULL pointers. > > Signed-off-by: James Liao <jamesjj.liao@mediatek.com> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> > --- > drivers/clk/mediatek/clk-mtk.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c > index cf08db6..3528303 100644 > --- a/drivers/clk/mediatek/clk-mtk.c > +++ b/drivers/clk/mediatek/clk-mtk.c > @@ -209,12 +209,14 @@ struct clk * __init mtk_clk_register_composite(const struct mtk_composite *mc, > mc->flags); > > if (IS_ERR(clk)) { > - kfree(gate); > - kfree(mux); > + ret = PTR_ERR(clk); > + goto err_out; > } > > return clk; > err_out: > + kfree(div); > + kfree(gate); > kfree(mux); > > return ERR_PTR(ret); > -- > 1.9.1 >
WARNING: multiple messages have this Message-ID (diff)
From: djkurtz@chromium.org (Daniel Kurtz) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] clk: mediatek: Fix memory leak on clock init fail Date: Fri, 8 Jan 2016 16:21:18 +0800 [thread overview] Message-ID: <CAGS+omCXK4mFBz1HoDUMCPHKa5cqa4DOkbjBuratcps6nBLfig@mail.gmail.com> (raw) In-Reply-To: <1452240933-60695-1-git-send-email-jamesjj.liao@mediatek.com> On Fri, Jan 8, 2016 at 4:15 PM, James Liao <jamesjj.liao@mediatek.com> wrote: > mtk_clk_register_composite() may leak memory due to some error > handling path don't free all allocated memory. This patch > free all pointers that may allocate memory before error return. > And it's safe because kfree() can handle NULL pointers. > > Signed-off-by: James Liao <jamesjj.liao@mediatek.com> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> > --- > drivers/clk/mediatek/clk-mtk.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c > index cf08db6..3528303 100644 > --- a/drivers/clk/mediatek/clk-mtk.c > +++ b/drivers/clk/mediatek/clk-mtk.c > @@ -209,12 +209,14 @@ struct clk * __init mtk_clk_register_composite(const struct mtk_composite *mc, > mc->flags); > > if (IS_ERR(clk)) { > - kfree(gate); > - kfree(mux); > + ret = PTR_ERR(clk); > + goto err_out; > } > > return clk; > err_out: > + kfree(div); > + kfree(gate); > kfree(mux); > > return ERR_PTR(ret); > -- > 1.9.1 >
next prev parent reply other threads:[~2016-01-08 8:21 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-08 8:15 [PATCH] clk: mediatek: Fix memory leak on clock init fail James Liao 2016-01-08 8:15 ` James Liao 2016-01-08 8:15 ` James Liao 2016-01-08 8:21 ` Daniel Kurtz [this message] 2016-01-08 8:21 ` Daniel Kurtz 2016-01-08 8:21 ` Daniel Kurtz
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAGS+omCXK4mFBz1HoDUMCPHKa5cqa4DOkbjBuratcps6nBLfig@mail.gmail.com \ --to=djkurtz@chromium.org \ --cc=jamesjj.liao@mediatek.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=matthias.bgg@gmail.com \ --cc=mturquette@baylibre.com \ --cc=sboyd@codeaurora.org \ --cc=srv_heupstream@mediatek.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.