From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754260AbcAHIVl (ORCPT ); Fri, 8 Jan 2016 03:21:41 -0500 Received: from mail-vk0-f49.google.com ([209.85.213.49]:36080 "EHLO mail-vk0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754133AbcAHIVj (ORCPT ); Fri, 8 Jan 2016 03:21:39 -0500 MIME-Version: 1.0 In-Reply-To: <1452240933-60695-1-git-send-email-jamesjj.liao@mediatek.com> References: <1452240933-60695-1-git-send-email-jamesjj.liao@mediatek.com> From: Daniel Kurtz Date: Fri, 8 Jan 2016 16:21:18 +0800 X-Google-Sender-Auth: R9g-thAUHh45M3QN0IfsSV-FniY Message-ID: Subject: Re: [PATCH] clk: mediatek: Fix memory leak on clock init fail To: James Liao Cc: Matthias Brugger , Mike Turquette , Stephen Boyd , Sascha Hauer , srv_heupstream , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "moderated list:ARM/Mediatek SoC support" , linux-clk@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 8, 2016 at 4:15 PM, James Liao 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 Reviewed-by: Daniel Kurtz > --- > 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 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: MIME-Version: 1.0 Sender: djkurtz@google.com In-Reply-To: <1452240933-60695-1-git-send-email-jamesjj.liao@mediatek.com> References: <1452240933-60695-1-git-send-email-jamesjj.liao@mediatek.com> From: Daniel Kurtz Date: Fri, 8 Jan 2016 16:21:18 +0800 Message-ID: Subject: Re: [PATCH] clk: mediatek: Fix memory leak on clock init fail To: James Liao Cc: Matthias Brugger , Mike Turquette , Stephen Boyd , Sascha Hauer , srv_heupstream , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "moderated list:ARM/Mediatek SoC support" , linux-clk@vger.kernel.org Content-Type: text/plain; charset=UTF-8 List-ID: On Fri, Jan 8, 2016 at 4:15 PM, James Liao 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 Reviewed-by: Daniel Kurtz > --- > 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 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: djkurtz@chromium.org (Daniel Kurtz) Date: Fri, 8 Jan 2016 16:21:18 +0800 Subject: [PATCH] clk: mediatek: Fix memory leak on clock init fail In-Reply-To: <1452240933-60695-1-git-send-email-jamesjj.liao@mediatek.com> References: <1452240933-60695-1-git-send-email-jamesjj.liao@mediatek.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Jan 8, 2016 at 4:15 PM, James Liao 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 Reviewed-by: Daniel Kurtz > --- > 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 >