lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 407/453] spi: mxic: Dont leak SPI master in probe error path
    Date
    From: Lukas Wunner <lukas@wunner.de>

    commit cc53711b2191cf3b3210283ae89bf0abb98c70a3 upstream.

    If the calls to devm_clk_get() or devm_ioremap_resource() fail on probe
    of the Macronix SPI driver, the spi_master struct is erroneously not freed.

    Fix by switching over to the new devm_spi_alloc_master() helper.

    Fixes: b942d80b0a39 ("spi: Add MXIC controller driver")
    Signed-off-by: Lukas Wunner <lukas@wunner.de>
    Cc: <stable@vger.kernel.org> # v5.0+: 5e844cc37a5c: spi: Introduce device-managed SPI controller allocation
    Cc: <stable@vger.kernel.org> # v5.0+
    Cc: Mason Yang <masonccyang@mxic.com.tw>
    Link: https://lore.kernel.org/r/4fa6857806e7e75741c05d057ac9df3564460114.1607286887.git.lukas@wunner.de
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/spi/spi-mxic.c | 10 ++--------
    1 file changed, 2 insertions(+), 8 deletions(-)

    --- a/drivers/spi/spi-mxic.c
    +++ b/drivers/spi/spi-mxic.c
    @@ -528,7 +528,7 @@ static int mxic_spi_probe(struct platfor
    struct mxic_spi *mxic;
    int ret;

    - master = spi_alloc_master(&pdev->dev, sizeof(struct mxic_spi));
    + master = devm_spi_alloc_master(&pdev->dev, sizeof(struct mxic_spi));
    if (!master)
    return -ENOMEM;

    @@ -573,15 +573,9 @@ static int mxic_spi_probe(struct platfor
    ret = spi_register_master(master);
    if (ret) {
    dev_err(&pdev->dev, "spi_register_master failed\n");
    - goto err_put_master;
    + pm_runtime_disable(&pdev->dev);
    }

    - return 0;
    -
    -err_put_master:
    - spi_master_put(master);
    - pm_runtime_disable(&pdev->dev);
    -
    return ret;
    }


    \
     
     \ /
      Last update: 2020-12-28 16:27    [W:4.137 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site