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 4.9 002/175] spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit d853b3406903a7dc5b14eb5bada3e8cd677f66a2 ]

    Clang warns:

    drivers/spi/spi-bcm2835aux.c:532:50: warning: variable 'err' is
    uninitialized when used here [-Wuninitialized]
    dev_err(&pdev->dev, "could not get clk: %d\n", err);
    ^~~
    ./include/linux/dev_printk.h:112:32: note: expanded from macro 'dev_err'
    _dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__)
    ^~~~~~~~~~~
    drivers/spi/spi-bcm2835aux.c:495:9: note: initialize the variable 'err'
    to silence this warning
    int err;
    ^
    = 0
    1 warning generated.

    Restore the assignment so that the error value can be used in the
    dev_err statement and there is no uninitialized memory being leaked.

    Fixes: e13ee6cc4781 ("spi: bcm2835aux: Fix use-after-free on unbind")
    Link: https://github.com/ClangBuiltLinux/linux/issues/1199
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Link: https://lore.kernel.org/r/20201113180701.455541-1-natechancellor@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    [lukas: backport to 4.19-stable, add stable designation]
    Signed-off-by: Lukas Wunner <lukas@wunner.de>
    Cc: <stable@vger.kernel.org> # v4.4+: e13ee6cc4781: spi: bcm2835aux: Fix use-after-free on unbind
    Cc: <stable@vger.kernel.org> # v4.4+
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/spi/spi-bcm2835aux.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/spi/spi-bcm2835aux.c
    +++ b/drivers/spi/spi-bcm2835aux.c
    @@ -444,8 +444,9 @@ static int bcm2835aux_spi_probe(struct p

    bs->clk = devm_clk_get(&pdev->dev, NULL);
    if ((!bs->clk) || (IS_ERR(bs->clk))) {
    + err = PTR_ERR(bs->clk);
    dev_err(&pdev->dev, "could not get clk: %d\n", err);
    - return PTR_ERR(bs->clk);
    + return err;
    }

    bs->irq = platform_get_irq(pdev, 0);

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