From: dinghao.liu@zju.edu.cn
To: "Maxime Ripard" <maxime@cerno.tech>
Cc: kjlu@umn.edu, "Alessandro Zummo" <a.zummo@towertech.it>,
"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
"Chen-Yu Tsai" <wens@csie.org>,
linux-rtc@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: Re: [PATCH] [v2] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
Date: Tue, 20 Oct 2020 13:53:59 +0800 (GMT+08:00) [thread overview]
Message-ID: <7821f744.b49c.17544924954.Coremail.dinghao.liu@zju.edu.cn> (raw)
In-Reply-To: <20201019080202.kgjoksz27dgyov7q@gilmour.lan>
> Hi,
>
> On Sun, Oct 18, 2020 at 03:28:10PM +0800, Dinghao Liu wrote:
> > When clk_hw_register_fixed_rate_with_accuracy() fails,
> > clk_data should be freed. It's the same for the subsequent
> > two error paths, but we should also unregister the already
> > registered clocks in them.
> >
> > Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> > ---
> >
> > Changelog:
> >
> > v2: - Unregister the already registered clocks on failure.
> > ---
> > drivers/rtc/rtc-sun6i.c | 8 +++++---
> > 1 file changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
> > index e2b8b150bcb4..6de0d3ad736a 100644
> > --- a/drivers/rtc/rtc-sun6i.c
> > +++ b/drivers/rtc/rtc-sun6i.c
> > @@ -272,7 +272,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
> > 300000000);
> > if (IS_ERR(rtc->int_osc)) {
> > pr_crit("Couldn't register the internal oscillator\n");
> > - return;
> > + goto err;
> > }
> >
> > parents[0] = clk_hw_get_name(rtc->int_osc);
> > @@ -290,7 +290,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
> > rtc->losc = clk_register(NULL, &rtc->hw);
> > if (IS_ERR(rtc->losc)) {
> > pr_crit("Couldn't register the LOSC clock\n");
> > - return;
> > + clk_hw_unregister_fixed_rate(rtc->int_osc);
> > + goto err;
> > }
>
> The point of having labels for the error sequence is to avoid to
> duplicate the error handling code in each and every error code path.
>
> You should add another label for the fixed rate clock unregistration
>
Fine, I will fix this soon.
Regards,
Dinghao
prev parent reply other threads:[~2020-10-20 5:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-18 7:28 [PATCH] [v2] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init Dinghao Liu
2020-10-19 8:02 ` Maxime Ripard
2020-10-20 5:53 ` dinghao.liu [this message]
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=7821f744.b49c.17544924954.Coremail.dinghao.liu@zju.edu.cn \
--to=dinghao.liu@zju.edu.cn \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=kjlu@umn.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=maxime@cerno.tech \
--cc=wens@csie.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).