diff mbox series

[5.4,14/85] Platform: OLPC: Fix memleak in olpc_ec_probe

Message ID	20201012132633.557770036@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=uWP8=DT=vger.kernel.org=stable-owner@kernel.org> 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>, Andy Shevchenko <andriy.shevchenko@linux.intel.com> Subject: [PATCH 5.4 14/85] Platform: OLPC: Fix memleak in olpc_ec_probe Date: Mon, 12 Oct 2020 15:26:37 +0200 Message-Id: <20201012132633.557770036@linuxfoundation.org> In-Reply-To: <20201012132632.846779148@linuxfoundation.org> References: <20201012132632.846779148@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,03/85] fbcon: Fix global-out-of-bounds read in fbcon_get_font() [5.4,05/85] io_uring: Fix resource leaking when kill the process [5.4,08/85] io_uring: Fix double list add in io_queue_async_work() [5.4,09/85] net: wireless: nl80211: fix out-of-bounds access in nl80211_del_key() [5.4,14/85] Platform: OLPC: Fix memleak in olpc_ec_probe [5.4,17/85] bpf: Fix sysfs export of empty BTF section [5.4,21/85] driver core: Fix probe_count imbalance in really_probe() [5.4,22/85] perf test session topology: Fix data path [5.4,23/85] perf top: Fix stdio interface input handling with glibc 2.28+ [5.4,25/85] arm64: dts: stratix10: add status to qspi dts node [5.4,26/85] Btrfs: send, allow clone operations within the same file [5.4,28/85] btrfs: volumes: Use more straightforward way to calculate map length [5.4,31/85] btrfs: allow btrfs_truncate_block() to fallback to nocow for data space reservation [5.4,32/85] nvme-core: put ctrl ref when module ref get fail [5.4,34/85] mm/khugepaged: fix filemap page_to_pgoff(page) != offset [5.4,35/85] net: introduce helper sendpage_ok() in include/linux/net.h [5.4,37/85] nvme-tcp: check page by sendpage_ok() before calling kernel_sendpage() [5.4,38/85] xfrmi: drop ignore_df check before updating pmtu [5.4,39/85] cifs: Fix incomplete memory allocation on setxattr path [5.4,40/85] i2c: meson: fix clock setting overwrite [5.4,43/85] sctp: fix sctp_auth_init_hmacs() error path [5.4,45/85] net: team: fix memory leak in __team_options_register [5.4,46/85] openvswitch: handle DNAT tuple collision [5.4,49/85] xfrm: clone XFRMA_SET_MARK in xfrm_do_migrate [5.4,50/85] xfrm: clone XFRMA_REPLAY_ESN_VAL in xfrm_do_migrate [5.4,51/85] xfrm: clone XFRMA_SEC_CTX in xfrm_do_migrate [5.4,54/85] platform/x86: fix kconfig dependency warning for FUJITSU_LAPTOP [5.4,56/85] iavf: use generic power management [5.4,57/85] iavf: Fix incorrect adapter get in iavf_resume [5.4,58/85] net: ethernet: cavium: octeon_mgmt: use phy_start and phy_stop [5.4,60/85] mdio: fix mdio-thunder.c dependency & build error [5.4,63/85] net: usb: ax88179_178a: fix missing stop entry in driver_info [5.4,64/85] virtio-net: dont disable guest csum when disable LRO [5.4,65/85] net/mlx5: Avoid possible free of command entry while timeout comp handler [5.4,70/85] rxrpc: Fix rxkad token xdr encoding [5.4,73/85] rxrpc: The server keyring isnt network-namespaced [5.4,75/85] perf: Fix task_function_call() error handling [5.4,76/85] mmc: core: dont set limits.discard_granularity as 0 [5.4,79/85] net/core: check length before updating Ethertype in skb_mpls_{push,pop} [5.4,80/85] net/tls: race causes kernel panic [5.4,82/85] Input: ati_remote2 - add missing newlines when printing module parameters [5.4,85/85] net_sched: commit action insertions together

Commit Message

Greg KH Oct. 12, 2020, 1:26 p.m. UTC

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

commit 4fd9ac6bd3044734a7028bd993944c3617d1eede upstream.

When devm_regulator_register() fails, ec should be
freed just like when olpc_ec_cmd() fails.

Fixes: 231c0c216172a ("Platform: OLPC: Add a regulator for the DCON")
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/platform/olpc/olpc-ec.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/platform/olpc/olpc-ec.c
+++ b/drivers/platform/olpc/olpc-ec.c
@@ -439,7 +439,9 @@  static int olpc_ec_probe(struct platform
 								&config);
 	if (IS_ERR(ec->dcon_rdev)) {
 		dev_err(&pdev->dev, "failed to register DCON regulator\n");
-		return PTR_ERR(ec->dcon_rdev);
+		err = PTR_ERR(ec->dcon_rdev);
+		kfree(ec);
+		return err;
 	}
 
 	ec->dbgfs_dir = olpc_ec_setup_debugfs();