]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: rockchip-sfc: Fix double-free in remove() callback
authorFelix Gu <ustc.gu@gmail.com>
Mon, 9 Mar 2026 18:01:34 +0000 (02:01 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 9 Mar 2026 19:10:21 +0000 (19:10 +0000)
The driver uses devm_spi_register_controller() for registration, which
automatically unregisters the controller via devm cleanup when the
device is removed. The manual call to spi_unregister_controller() in
the remove() callback can lead to a double-free.

And to make sure controller is unregistered before DMA buffer is
unmapped, switch to use spi_register_controller() in probe().

Fixes: 8011709906d0 ("spi: rockchip-sfc: Support pm ops")
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
Link: https://patch.msgid.link/20260310-sfc-v2-1-67fab04b097f@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-rockchip-sfc.c

index 2990bf85ee4784ea438153e1b67c1c509995ab72..174995042f53a9c49013436883080932621daaa0 100644 (file)
@@ -711,7 +711,7 @@ static int rockchip_sfc_probe(struct platform_device *pdev)
                }
        }
 
-       ret = devm_spi_register_controller(dev, host);
+       ret = spi_register_controller(host);
        if (ret)
                goto err_register;