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.10 644/717] spi: spi-mtk-nor: Dont leak SPI master in probe error path
    Date
    From: Lukas Wunner <lukas@wunner.de>

    commit 0f4ad8d59f33b24dd86739f3be23e6af1a86f5a9 upstream.

    If the call to devm_spi_register_controller() fails on probe of the
    MediaTek SPI NOR driver, the spi_controller struct is erroneously not
    freed.

    Since commit a1daaa991ed1 ("spi: spi-mtk-nor: use dma_alloc_coherent()
    for bounce buffer"), the same happens if the call to
    dmam_alloc_coherent() fails.

    Since commit 3bfd9103c7af ("spi: spi-mtk-nor: Add power management
    support"), the same happens if the call to mtk_nor_enable_clk() fails.

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

    Fixes: 881d1ee9fe81 ("spi: add support for mediatek spi-nor controller")
    Signed-off-by: Lukas Wunner <lukas@wunner.de>
    Reviewed-by: Ikjoon Jang <ikjn@chromium.org>
    Cc: <stable@vger.kernel.org> # v5.7+: 5e844cc37a5c: spi: Introduce device-managed SPI controller allocation
    Cc: <stable@vger.kernel.org> # v5.7+
    Cc: Chuanhong Guo <gch981213@gmail.com>
    Link: https://lore.kernel.org/r/d5b9f0289465394e73dedb8ec51e180a8f1dffc9.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-mtk-nor.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/spi/spi-mtk-nor.c
    +++ b/drivers/spi/spi-mtk-nor.c
    @@ -768,7 +768,7 @@ static int mtk_nor_probe(struct platform
    return -EINVAL;
    }

    - ctlr = spi_alloc_master(&pdev->dev, sizeof(*sp));
    + ctlr = devm_spi_alloc_master(&pdev->dev, sizeof(*sp));
    if (!ctlr) {
    dev_err(&pdev->dev, "failed to allocate spi controller\n");
    return -ENOMEM;

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