]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: bcm2835: Do not call gpiod_put() on invalid descriptor
authorFlorian Fainelli <florian.fainelli@broadcom.com>
Tue, 1 Apr 2025 22:42:38 +0000 (15:42 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:39:33 +0000 (14:39 +0200)
[ Upstream commit d6691010523fe1016f482a1e1defcc6289eeea48 ]

If we are unable to lookup the chip-select GPIO, the error path will
call bcm2835_spi_cleanup() which unconditionally calls gpiod_put() on
the cs->gpio variable which we just determined was invalid.

Fixes: 21f252cd29f0 ("spi: bcm2835: reduce the abuse of the GPIO API")
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/20250401224238.2854256-1-florian.fainelli@broadcom.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/spi/spi-bcm2835.c

index e1b9b12357877fea810336fa687eed6654ee4f05..a5d621b94d5e32ff11341627d4600ce1df1cefb1 100644 (file)
@@ -1162,7 +1162,8 @@ static void bcm2835_spi_cleanup(struct spi_device *spi)
                                 sizeof(u32),
                                 DMA_TO_DEVICE);
 
-       gpiod_put(bs->cs_gpio);
+       if (!IS_ERR(bs->cs_gpio))
+               gpiod_put(bs->cs_gpio);
        spi_set_csgpiod(spi, 0, NULL);
 
        kfree(target);