[PATCH] spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe

[PATCH] spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe

[Nathan Chancellor]

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>
---
 drivers/spi/spi-bcm2835aux.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c
index fd58547110e6..1a26865c42f8 100644
--- a/drivers/spi/spi-bcm2835aux.c
+++ b/drivers/spi/spi-bcm2835aux.c
@@ -529,8 +529,9 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)
 
 	bs->clk = devm_clk_get(&pdev->dev, NULL);
 	if (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);

base-commit: c371dcf51cef4ae53d00090a148d004b113217f0
-- 
2.29.2

Re: [PATCH] spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe

[Mark Brown]

On Fri, 13 Nov 2020 11:07:02 -0700, Nathan Chancellor wrote:
> 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.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe
      commit: d853b3406903a7dc5b14eb5bada3e8cd677f66a2

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark