rtc: sun6i: ensure clk_data is kfree'd on error
authorColin Ian King <colin.king@canonical.com>
Wed, 19 Jul 2017 16:57:02 +0000 (17:57 +0100)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Sun, 30 Jul 2017 22:17:46 +0000 (00:17 +0200)
There are two error return paths that do not kfree clk_data and
we end up with a memory leak. Fix these with a kfree error exit
path.

Detected by CoverityScan, CID#1402959 ("Resource Leak")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
drivers/rtc/rtc-sun6i.c

index 7e7da604682bb60b3ad15246a21801ff2174f327..305c4d043f61da20390d9f15f09a097da930fab1 100644 (file)
@@ -204,7 +204,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node)
        rtc->base = of_io_request_and_map(node, 0, of_node_full_name(node));
        if (IS_ERR(rtc->base)) {
                pr_crit("Can't map RTC registers");
-               return;
+               goto err;
        }
 
        /* Switch to the external, more precise, oscillator */
@@ -216,7 +216,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node)
 
        /* Deal with old DTs */
        if (!of_get_property(node, "clocks", NULL))
-               return;
+               goto err;
 
        rtc->int_osc = clk_hw_register_fixed_rate_with_accuracy(NULL,
                                                                "rtc-int-osc",
@@ -246,6 +246,10 @@ static void __init sun6i_rtc_clk_init(struct device_node *node)
        clk_data->num = 1;
        clk_data->hws[0] = &rtc->hw;
        of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
+       return;
+
+err:
+       kfree(clk_data);
 }
 CLK_OF_DECLARE_DRIVER(sun6i_rtc_clk, "allwinner,sun6i-a31-rtc",
                      sun6i_rtc_clk_init);