All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Dinghao Liu <dinghao.liu@zju.edu.cn>,
	Alexandre Belloni <alexandre.belloni@bootlin.com>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.19 22/29] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
Date: Tue,  5 Jan 2021 10:29:08 +0100	[thread overview]
Message-ID: <20210105090821.395352321@linuxfoundation.org> (raw)
In-Reply-To: <20210105090818.518271884@linuxfoundation.org>

From: Dinghao Liu <dinghao.liu@zju.edu.cn>

[ Upstream commit 28d211919e422f58c1e6c900e5810eee4f1ce4c8 ]

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>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20201020061226.6572-1-dinghao.liu@zju.edu.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 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 2cd5a7b1a2e30..e85abe8056064 100644
--- a/drivers/rtc/rtc-sun6i.c
+++ b/drivers/rtc/rtc-sun6i.c
@@ -232,7 +232,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);
@@ -248,7 +248,7 @@ 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;
+		goto err_register;
 	}
 
 	of_property_read_string_index(node, "clock-output-names", 1,
@@ -259,7 +259,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node)
 					  &rtc->lock);
 	if (IS_ERR(rtc->ext_losc)) {
 		pr_crit("Couldn't register the LOSC external gate\n");
-		return;
+		goto err_register;
 	}
 
 	clk_data->num = 2;
@@ -268,6 +268,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node)
 	of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
 	return;
 
+err_register:
+	clk_hw_unregister_fixed_rate(rtc->int_osc);
 err:
 	kfree(clk_data);
 }
-- 
2.27.0




  parent reply	other threads:[~2021-01-05  9:29 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-05  9:28 [PATCH 4.19 00/29] 4.19.165-rc2 review Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 01/29] md/raid10: initialize r10_bio->read_slot before use Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 02/29] fscrypt: add fscrypt_is_nokey_name() Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 03/29] ext4: prevent creating duplicate encrypted filenames Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 04/29] f2fs: " Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 05/29] ubifs: " Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 06/29] vfio/pci: Move dummy_resources_list init in vfio_pci_probe() Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 07/29] ext4: dont remount read-only with errors=continue on reboot Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 08/29] uapi: move constants from <linux/kernel.h> to <linux/const.h> Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 09/29] KVM: SVM: relax conditions for allowing MSR_IA32_SPEC_CTRL accesses Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 10/29] KVM: x86: reinstate vendor-agnostic check on SPEC_CTRL cpuid bits Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 11/29] powerpc/bitops: Fix possible undefined behaviour with fls() and fls64() Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 12/29] xen/gntdev.c: Mark pages as dirty Greg Kroah-Hartman
2021-01-05  9:28 ` [PATCH 4.19 13/29] null_blk: Fix zone size initialization Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 14/29] of: fix linker-section match-table corruption Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 15/29] Bluetooth: hci_h5: close serdev device and free hu in h5_close Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 16/29] reiserfs: add check for an invalid ih_entry_count Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 17/29] misc: vmw_vmci: fix kernel info-leak by initializing dbells in vmci_ctx_get_chkpt_doorbells() Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 18/29] media: gp8psk: initialize stats at power control logic Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 19/29] ALSA: seq: Use bool for snd_seq_queue internal flags Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 20/29] ALSA: rawmidi: Access runtime->avail always in spinlock Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 21/29] fcntl: Fix potential deadlock in send_sig{io, urg}() Greg Kroah-Hartman
2021-01-05  9:29 ` Greg Kroah-Hartman [this message]
2021-01-05  9:29 ` [PATCH 4.19 23/29] module: set MODULE_STATE_GOING state when a module fails to load Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 24/29] quota: Dont overflow quota file offsets Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 25/29] powerpc: sysdev: add missing iounmap() on error in mpic_msgr_probe() Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 26/29] NFSv4: Fix a pNFS layout related use-after-free race when freeing the inode Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 27/29] module: delay kobject uevent until after module init call Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 28/29] ALSA: pcm: Clear the full allocated memory at hw_params Greg Kroah-Hartman
2021-01-05  9:29 ` [PATCH 4.19 29/29] dm verity: skip verity work if I/O error when system is shutting down Greg Kroah-Hartman
2021-01-05 10:12 ` [PATCH 4.19 00/29] 4.19.165-rc2 review Pavel Machek
2021-01-06 13:46   ` Greg Kroah-Hartman
2021-01-05 11:08 ` Jon Hunter
2021-01-06 13:46   ` Greg Kroah-Hartman
2021-01-05 18:16 ` Guenter Roeck
2021-01-06 13:45   ` Greg Kroah-Hartman
2021-01-05 22:29 ` Daniel Díaz
2021-01-06 13:45   ` Greg Kroah-Hartman

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=20210105090821.395352321@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=alexandre.belloni@bootlin.com \
    --cc=dinghao.liu@zju.edu.cn \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.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 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.