| Message ID | a203c24658b7d70ddb27bf1f9898fe6f896fead5.1605512876.git.lukas@wunner.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0f4ad8d59f33b24dd86739f3be23e6af1a86f5a9 |
| Headers | show |
| Series | [for-5.10] spi: spi-mtk-nor: Don't leak SPI master in probe error path | expand |
On Mon, Nov 16, 2020 at 4:43 PM Lukas Wunner <lukas@wunner.de> wrote: > > If the call to devm_spi_register_controller() fails on probe of the > MediaTek SPI NOR driver, the spi_controller struct is erroneously not > freed. > > Since commit a1daaa991ed1 ("spi: spi-mtk-nor: use dma_alloc_coherent() > for bounce buffer"), the same happens if the call to > dmam_alloc_coherent() fails. > > Since commit 3bfd9103c7af ("spi: spi-mtk-nor: Add power management > support"), the same happens if the call to mtk_nor_enable_clk() fails. > > Fix by switching over to the new devm_spi_alloc_master() helper. > > Fixes: 881d1ee9fe81 ("spi: add support for mediatek spi-nor controller") > Signed-off-by: Lukas Wunner <lukas@wunner.de> Reviewed-by: Ikjoon Jang <ikjn@chromium.org> > Cc: <stable@vger.kernel.org> # v5.7+: 5e844cc37a5c: spi: Introduce device-managed SPI controller allocation > Cc: <stable@vger.kernel.org> # v5.7+ > Cc: Chuanhong Guo <gch981213@gmail.com> > Cc: Ikjoon Jang <ikjn@chromium.org> > --- > drivers/spi/spi-mtk-nor.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/spi/spi-mtk-nor.c b/drivers/spi/spi-mtk-nor.c > index b97f26a60cbe..288f6c2bbd57 100644 > --- a/drivers/spi/spi-mtk-nor.c > +++ b/drivers/spi/spi-mtk-nor.c > @@ -768,7 +768,7 @@ static int mtk_nor_probe(struct platform_device *pdev) > return -EINVAL; > } > > - ctlr = spi_alloc_master(&pdev->dev, sizeof(*sp)); > + ctlr = devm_spi_alloc_master(&pdev->dev, sizeof(*sp)); > if (!ctlr) { > dev_err(&pdev->dev, "failed to allocate spi controller\n"); > return -ENOMEM; > -- > 2.28.0 >
On Mon, Nov 16, 2020 at 09:23:08AM +0100, Lukas Wunner wrote: > If the call to devm_spi_register_controller() fails on probe of the > MediaTek SPI NOR driver, the spi_controller struct is erroneously not > freed. Please don't thread things that aren't threads, this breaks tooling that attempts to understand what you're doing - for example b4 thinks every patch in this series is a new revision of a single patch. Just send separate patches with no interdependencies seperately. Please also try to avoid noise like the for-5.10 in the subject line.
diff --git a/drivers/spi/spi-mtk-nor.c b/drivers/spi/spi-mtk-nor.c index b97f26a60cbe..288f6c2bbd57 100644 --- a/drivers/spi/spi-mtk-nor.c +++ b/drivers/spi/spi-mtk-nor.c @@ -768,7 +768,7 @@ static int mtk_nor_probe(struct platform_device *pdev) return -EINVAL; } - ctlr = spi_alloc_master(&pdev->dev, sizeof(*sp)); + ctlr = devm_spi_alloc_master(&pdev->dev, sizeof(*sp)); if (!ctlr) { dev_err(&pdev->dev, "failed to allocate spi controller\n"); return -ENOMEM;
If the call to devm_spi_register_controller() fails on probe of the MediaTek SPI NOR driver, the spi_controller struct is erroneously not freed. Since commit a1daaa991ed1 ("spi: spi-mtk-nor: use dma_alloc_coherent() for bounce buffer"), the same happens if the call to dmam_alloc_coherent() fails. Since commit 3bfd9103c7af ("spi: spi-mtk-nor: Add power management support"), the same happens if the call to mtk_nor_enable_clk() fails. Fix by switching over to the new devm_spi_alloc_master() helper. Fixes: 881d1ee9fe81 ("spi: add support for mediatek spi-nor controller") Signed-off-by: Lukas Wunner <lukas@wunner.de> Cc: <stable@vger.kernel.org> # v5.7+: 5e844cc37a5c: spi: Introduce device-managed SPI controller allocation Cc: <stable@vger.kernel.org> # v5.7+ Cc: Chuanhong Guo <gch981213@gmail.com> Cc: Ikjoon Jang <ikjn@chromium.org> --- drivers/spi/spi-mtk-nor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)