misc: sram: fix resource leaks in probe error path
authorJohan Hovold <johan@kernel.org>
Tue, 3 Jul 2018 10:05:47 +0000 (12:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Aug 2018 05:46:11 +0000 (07:46 +0200)
commit f294d00961d1d869ecffa60e280eeeee1ccf9a49 upstream.

Make sure to disable clocks and deregister any exported partitions
before returning on late probe errors.

Note that since commit ee895ccdf776 ("misc: sram: fix enabled clock leak
on error path"), partitions are deliberately exported before enabling
the clock so we stick to that logic here. A follow up patch will address
this.

Cc: stable <stable@vger.kernel.org> # 4.9
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/sram.c

index fc0415771c0087264436d1ba434eccae8ef78dff..4dd0d868ff88818f7bcb8db51cac461cb6541684 100644 (file)
@@ -407,13 +407,20 @@ static int sram_probe(struct platform_device *pdev)
        if (init_func) {
                ret = init_func();
                if (ret)
-                       return ret;
+                       goto err_disable_clk;
        }
 
        dev_dbg(sram->dev, "SRAM pool: %zu KiB @ 0x%p\n",
                gen_pool_size(sram->pool) / 1024, sram->virt_base);
 
        return 0;
+
+err_disable_clk:
+       if (sram->clk)
+               clk_disable_unprepare(sram->clk);
+       sram_free_partitions(sram);
+
+       return ret;
 }
 
 static int sram_remove(struct platform_device *pdev)