linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: daniel.lezcano@linaro.org (Daniel Lezcano)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/69] clocksource/drivers/mtk_timer: Fix memleak in mtk_timer_init()
Date: Fri, 18 Dec 2015 15:17:16 +0100	[thread overview]
Message-ID: <1450448302-27429-3-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1450448302-27429-1-git-send-email-daniel.lezcano@linaro.org>

From: Alexey Klimov <alexey.klimov@linaro.org>

Add error path to clear evt struct allocated by kzalloc() in the beginning of
function mtk_timer_init().

Acked-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Alexey Klimov <alexey.klimov@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/clocksource/mtk_timer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/clocksource/mtk_timer.c b/drivers/clocksource/mtk_timer.c
index e1e0642..d67bc35 100644
--- a/drivers/clocksource/mtk_timer.c
+++ b/drivers/clocksource/mtk_timer.c
@@ -205,7 +205,7 @@ static void __init mtk_timer_init(struct device_node *node)
 	evt->gpt_base = of_io_request_and_map(node, 0, "mtk-timer");
 	if (IS_ERR(evt->gpt_base)) {
 		pr_err("Can't get resource\n");
-		return;
+		goto err_kzalloc;
 	}
 
 	evt->dev.irq = irq_of_parse_and_map(node, 0);
@@ -260,5 +260,7 @@ err_mem:
 	iounmap(evt->gpt_base);
 	of_address_to_resource(node, 0, &res);
 	release_mem_region(res.start, resource_size(&res));
+err_kzalloc:
+	kfree(evt);
 }
 CLOCKSOURCE_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init);
-- 
1.9.1

  parent reply	other threads:[~2015-12-18 14:17 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-17 14:50 [GIT PULL] clockevents for 4.5 Daniel Lezcano
2015-12-18 14:17 ` [PATCH 01/69] clocksource/drivers/mtk_timer: Add pr_fmt define Daniel Lezcano
2015-12-18 14:17   ` [PATCH 02/69] clocksource/drivers/mtk_timer: Fix pr_warn() messages in mtk_timer_init Daniel Lezcano
2015-12-30 18:15     ` Matthias Brugger
2015-12-18 14:17   ` Daniel Lezcano [this message]
2015-12-18 14:17   ` [PATCH 04/69] clocksource/drivers/tegra: Allow timer irq affinity change Daniel Lezcano
2015-12-18 14:17   ` [PATCH 05/69] clocksource/drivers/rockchip: Make the driver more readable Daniel Lezcano
2015-12-18 14:17   ` [PATCH 06/69] time: Define dummy functions for the generic sched clock Daniel Lezcano
2015-12-18 14:17   ` [PATCH 07/69] clocksource/drivers/rockchip: Remove dsb() usage Daniel Lezcano
2015-12-18 14:17   ` [PATCH 08/69] clocksource/drivers/qcom: Make COMPILE_TEST enabled for ARM architecture Daniel Lezcano
2015-12-18 14:17   ` [PATCH 09/69] clocksource/drivers/st_lpc: Fix Kconfig dependency Daniel Lezcano
2015-12-18 14:17   ` [PATCH 10/69] clocksource/drivers/st_lpc: Add the COMPILE_TEST option Daniel Lezcano
2015-12-18 14:17   ` [PATCH 11/69] clocksource/drivers/pxa_timer: Move the Kconfig rule Daniel Lezcano
2015-12-18 14:17   ` [PATCH 12/69] clocksource/drivers/pxa_timer: Add the COMPILE_TEST option Daniel Lezcano
2015-12-18 14:17   ` [PATCH 13/69] clocksource/drivers/tango: Add " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 14/69] clocksource/drivers/pistachio: Add the " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 15/69] clocksource/drivers/mediatek: " Daniel Lezcano
2015-12-30 18:16     ` Matthias Brugger
2015-12-18 14:17   ` [PATCH 16/69] clocksource/drivers/rockchip: Add " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 17/69] clocksource/drivers/armada-370-xp: Add the " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 18/69] clocksource/drivers/meson6: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 19/69] clocksource/drivers/orion: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 20/69] clocksource/drivers/digicolor: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 21/69] clocksource/drivers/dw_apb: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 22/69] clocksource/drivers/sun4i: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 23/69] clocksource/drivers/sun5i: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 24/69] clocksource/drivers/tegra2: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 25/69] clocksource/drivers/vt8500: Remove unneeded header Daniel Lezcano
2015-12-18 14:17   ` [PATCH 26/69] clocksource/drivers/vt8500: Add the COMPILE_TEST option Daniel Lezcano
2015-12-18 14:17   ` [PATCH 27/69] clocksource/drivers/cadence_ttc: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 28/69] clocksource/drivers/asm9260: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 29/69] clocksource/drivers/lpc32xx: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 30/69] clocksource/drivers/nomadik_mtu: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 31/69] clocksource/drivers/prcmu: Fix Kconfig and add " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 32/69] clocksource/drivers/exynos_mct: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 33/69] clocksource/drivers/samsung-pwm: Add the " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 34/69] clocksource/drivers/fsl-ftm: " Daniel Lezcano
2015-12-18 14:17   ` [PATCH 35/69] clocksource/drivers/Kconfig: Add missing GENERIC_CLOCKEVENTS dependency Daniel Lezcano
2015-12-18 14:17   ` [PATCH 36/69] clocksource/drivers/dw_apb_timer_of: Implement ARM delay timer Daniel Lezcano
2015-12-18 14:17   ` [PATCH 37/69] clocksource/drivers/h8300: Cleanup startup and remove module code Daniel Lezcano
2015-12-18 14:17   ` [PATCH 38/69] clocksource/drivers/h8300_timer8: Fix compilation error with dev_warn Daniel Lezcano
2015-12-18 14:17   ` [PATCH 39/69] clocksource/drivers/h8300_tpu: Remove unused macros Daniel Lezcano
2015-12-18 14:17   ` [PATCH 40/69] clocksource/drivers/h8300_tpu: Remove pointless headers for TPU Daniel Lezcano
2015-12-18 14:17   ` [PATCH 41/69] clocksource/drivers/h8300_timer8: Remove unused headers Daniel Lezcano
2015-12-18 14:17   ` [PATCH 42/69] clocksource/drivers/h8300_timer8: Remove unused macros Daniel Lezcano
2015-12-18 14:17   ` [PATCH 43/69] clocksource/drivers/h8300_timer8: Remove PERIODIC and ONESHOT macro Daniel Lezcano
2015-12-18 14:17   ` [PATCH 44/69] clocksource/drivers/h8300_timer8: Fix irq return value check Daniel Lezcano
2015-12-18 14:17   ` [PATCH 45/69] clocksource/drivers/h8300_timer8: Remove pointless irq re-entrant safe code Daniel Lezcano
2015-12-18 14:17   ` [PATCH 46/69] clocksource/drivers/h8300_timer8: Remove irq and lock legacy code Daniel Lezcano
2015-12-18 14:18   ` [PATCH 47/69] clocksource/drivers/h8300_timer8: Retrieve the clock rate at init time Daniel Lezcano
2015-12-18 14:18   ` [PATCH 48/69] clocksource/drivers/h8300_timer16: Remove pointless headers Daniel Lezcano
2015-12-18 14:18   ` [PATCH 49/69] clocksource/drivers/h8300_timer16: Remove unused macros Daniel Lezcano
2015-12-18 14:18   ` [PATCH 50/69] clocksource/drivers/h8300_timer16: Remove unused fields in timer16_priv Daniel Lezcano
2015-12-18 14:18   ` [PATCH 51/69] clocksource/drivers/h8300_timer16: Fix irq return value check Daniel Lezcano
2015-12-18 14:18   ` [PATCH 52/69] clocksource/drivers/h8300_timer16: Remove pointless lock Daniel Lezcano
2015-12-18 14:18   ` [PATCH 53/69] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init Daniel Lezcano
2015-12-18 14:18   ` [PATCH 54/69] clocksource/drivers/h8300_timer8: Separate the Kconfig option from the arch Daniel Lezcano
2015-12-18 14:18   ` [PATCH 55/69] h8300: Rename ctlr_out/in[bwl] to raw_read/write[bwl] Daniel Lezcano
2015-12-18 14:18   ` [PATCH 56/69] clocksource/drivers/h8300: Increase the compilation test coverage Daniel Lezcano
2015-12-18 14:18   ` [PATCH 57/69] clocksource/drivers/tango-xtal: Replace code by clocksource_mmio_init Daniel Lezcano
2015-12-18 14:18   ` [PATCH 58/69] clocksource/drivers/dw_apb_timer: Fix apbt_readl return types Daniel Lezcano
2015-12-18 14:18   ` [PATCH 59/69] clocksource/drivers/dw_apb_timer: Use {readl|writel}_relaxed in critical path Daniel Lezcano
2015-12-18 14:18   ` [PATCH 60/69] clocksource/drivers/dw_apb_timer: Inline apbt_readl and apbt_writel Daniel Lezcano
2015-12-18 14:18   ` [PATCH 61/69] clockevents/drivers/arm_global_timer: Use writel_relaxed in gt_compare_set Daniel Lezcano
2015-12-18 14:18   ` [PATCH 62/69] clocksource/drivers/pistachio: Fix wrong calculated clocksource read value Daniel Lezcano
2015-12-18 14:18   ` [PATCH 63/69] clocksource/drivers/arm_global_timer: Fix suspend resume Daniel Lezcano
2015-12-18 14:18   ` [PATCH 64/69] clocksource/drivers/lpc32: Correct pr_err() output format Daniel Lezcano
2015-12-18 14:18   ` [PATCH 65/69] clocksource/drivers/h8300: Change to overflow interrupt Daniel Lezcano
2015-12-18 14:18   ` [PATCH 66/69] clocksource/drivers/h8300: Fix timer not overflow case Daniel Lezcano
2015-12-18 14:18   ` [PATCH 67/69] clocksource/drivers/h8300: Simplify delta handling Daniel Lezcano
2015-12-18 14:18   ` [PATCH 68/69] clocksource/drivers/h8300: Initializer cleanup Daniel Lezcano
2015-12-18 14:18   ` [PATCH 69/69] clocksource/drivers/h8300: Use ioread / iowrite Daniel Lezcano

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=1450448302-27429-3-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.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).