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 655/717] spi: spi-geni-qcom: Fix use-after-free on unbind
    Date
    From: Lukas Wunner <lukas@wunner.de>

    commit 8f96c434dfbc85ffa755d6634c8c1cb2233fcf24 upstream.

    spi_geni_remove() accesses the driver's private data after calling
    spi_unregister_master() even though that function releases the last
    reference on the spi_master and thereby frees the private data.

    Moreover, since commit 1a9e489e6128 ("spi: spi-geni-qcom: Use OPP API to
    set clk/perf state"), spi_geni_probe() leaks the spi_master allocation
    if the calls to dev_pm_opp_set_clkname() or dev_pm_opp_of_add_table()
    fail.

    Fix by switching over to the new devm_spi_alloc_master() helper which
    keeps the private data accessible until the driver has unbound and also
    avoids the spi_master leak on probe.

    Fixes: 561de45f72bd ("spi: spi-geni-qcom: Add SPI driver support for GENI based QUP")
    Signed-off-by: Lukas Wunner <lukas@wunner.de>
    Cc: <stable@vger.kernel.org> # v4.20+: 5e844cc37a5c: spi: Introduce device-managed SPI controller allocation
    Cc: <stable@vger.kernel.org> # v4.20+
    Cc: Rajendra Nayak <rnayak@codeaurora.org>
    Cc: Girish Mahadevan <girishm@codeaurora.org>
    Link: https://lore.kernel.org/r/dfa1d8c41b8acdfad87ec8654cd124e6e3cb3f31.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-geni-qcom.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/drivers/spi/spi-geni-qcom.c
    +++ b/drivers/spi/spi-geni-qcom.c
    @@ -603,7 +603,7 @@ static int spi_geni_probe(struct platfor
    if (IS_ERR(clk))
    return PTR_ERR(clk);

    - spi = spi_alloc_master(dev, sizeof(*mas));
    + spi = devm_spi_alloc_master(dev, sizeof(*mas));
    if (!spi)
    return -ENOMEM;

    @@ -673,7 +673,6 @@ spi_geni_probe_free_irq:
    free_irq(mas->irq, spi);
    spi_geni_probe_runtime_disable:
    pm_runtime_disable(dev);
    - spi_master_put(spi);
    dev_pm_opp_of_remove_table(&pdev->dev);
    put_clkname:
    dev_pm_opp_put_clkname(mas->se.opp_table);

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