releases/4.9.128/mfd-ti_am335x_tscadc-fix-struct-clk-memory-leak.patch

   1 From foo@baz Mon Sep 17 12:22:41 CEST 2018
   2 From: Zumeng Chen <zumeng.chen@gmail.com>
   3 Date: Wed, 4 Jul 2018 12:35:29 +0800
   4 Subject: mfd: ti_am335x_tscadc: Fix struct clk memory leak
   5
   6 From: Zumeng Chen <zumeng.chen@gmail.com>
   7
   8 [ Upstream commit c2b1509c77a99a0dcea0a9051ca743cb88385f50 ]
   9
  10 Use devm_elk_get() to let Linux manage struct clk memory to avoid the following
  11 memory leakage report:
  12
  13 unreferenced object 0xdd75efc0 (size 64):
  14   comm "systemd-udevd", pid 186, jiffies 4294945126 (age 1195.750s)
  15   hex dump (first 32 bytes):
  16     61 64 63 5f 74 73 63 5f 66 63 6b 00 00 00 00 00  adc_tsc_fck.....
  17     00 00 00 00 92 03 00 00 00 00 00 00 00 00 00 00  ................
  18   backtrace:
  19     [<c0a15260>] kmemleak_alloc+0x40/0x74
  20     [<c0287a10>] __kmalloc_track_caller+0x198/0x388
  21     [<c0255610>] kstrdup+0x40/0x5c
  22     [<c025565c>] kstrdup_const+0x30/0x3c
  23     [<c0636630>] __clk_create_clk+0x60/0xac
  24     [<c0630918>] clk_get_sys+0x74/0x144
  25     [<c0630cdc>] clk_get+0x5c/0x68
  26     [<bf0ac540>] ti_tscadc_probe+0x260/0x468 [ti_am335x_tscadc]
  27     [<c06f3c0c>] platform_drv_probe+0x60/0xac
  28     [<c06f1abc>] driver_probe_device+0x214/0x2dc
  29     [<c06f1c18>] __driver_attach+0x94/0xc0
  30     [<c06efe2c>] bus_for_each_dev+0x90/0xa0
  31     [<c06f1470>] driver_attach+0x28/0x30
  32     [<c06f1030>] bus_add_driver+0x184/0x1ec
  33     [<c06f2b74>] driver_register+0xb0/0xf0
  34     [<c06f3b4c>] __platform_driver_register+0x40/0x54
  35
  36 Signed-off-by: Zumeng Chen <zumeng.chen@gmail.com>
  37 Signed-off-by: Lee Jones <lee.jones@linaro.org>
  38 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  39 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  40 ---
  41  drivers/mfd/ti_am335x_tscadc.c |    3 +--
  42  1 file changed, 1 insertion(+), 2 deletions(-)
  43
  44 --- a/drivers/mfd/ti_am335x_tscadc.c
  45 +++ b/drivers/mfd/ti_am335x_tscadc.c
  46 @@ -209,14 +209,13 @@ static    int ti_tscadc_probe(struct platfo
  47          * The TSC_ADC_SS controller design assumes the OCP clock is
  48          * at least 6x faster than the ADC clock.
  49          */
  50 -       clk = clk_get(&pdev->dev, "adc_tsc_fck");
  51 +       clk = devm_clk_get(&pdev->dev, "adc_tsc_fck");
  52         if (IS_ERR(clk)) {
  53                 dev_err(&pdev->dev, "failed to get TSC fck\n");
  54                 err = PTR_ERR(clk);
  55                 goto err_disable_clk;
  56         }
  57         clock_rate = clk_get_rate(clk);
  58 -       clk_put(clk);
  59         tscadc->clk_div = clock_rate / ADC_CLK;
  60
  61         /* TSCADC_CLKDIV needs to be configured to the value minus 1 */