lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 408/496] spi: bcm-qspi: fIX some error handling paths
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Christophe Jaillet <christophe.jaillet@wanadoo.fr>

    [ Upstream commit bc3cc75281b3c2b1c5355d88d147b66a753bb9a5 ]

    For some reason, commit c0368e4db4a3 ("spi: bcm-qspi: Fix use after free
    in bcm_qspi_probe() in error path") has updated some gotos, but not all of
    them.

    This looks spurious, so fix it.

    Fixes: fa236a7ef240 ("spi: bcm-qspi: Add Broadcom MSPI driver")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/spi/spi-bcm-qspi.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/spi/spi-bcm-qspi.c
    +++ b/drivers/spi/spi-bcm-qspi.c
    @@ -1255,7 +1255,7 @@ int bcm_qspi_probe(struct platform_devic
    qspi->base[MSPI] = devm_ioremap_resource(dev, res);
    if (IS_ERR(qspi->base[MSPI])) {
    ret = PTR_ERR(qspi->base[MSPI]);
    - goto qspi_probe_err;
    + goto qspi_resource_err;
    }
    } else {
    goto qspi_resource_err;
    @@ -1266,7 +1266,7 @@ int bcm_qspi_probe(struct platform_devic
    qspi->base[BSPI] = devm_ioremap_resource(dev, res);
    if (IS_ERR(qspi->base[BSPI])) {
    ret = PTR_ERR(qspi->base[BSPI]);
    - goto qspi_probe_err;
    + goto qspi_resource_err;
    }
    qspi->bspi_mode = true;
    } else {

    \
     
     \ /
      Last update: 2018-05-28 14:33    [W:4.046 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site