spi: mpc52xx: Add cancel_work_sync before module remove

BugLink: https://bugs.launchpad.net/bugs/2102118

[ Upstream commit 984836621aad98802d92c4a3047114cf518074c8 ]

If we remove the module which will call mpc52xx_spi_remove
it will free 'ms' through spi_unregister_controller.
while the work ms->work will be used. The sequence of operations
that may lead to a UAF bug.

Fix it by ensuring that the work is canceled before proceeding with
the cleanup in mpc52xx_spi_remove.

Fixes: ca632f5566 ("spi: reorganize drivers")
Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
Link: https://patch.msgid.link/1f16f8ae0e50ca9adb1dc849bf2ac65a40c9ceb9.1732783000.git.xiaopei01@kylinos.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
CVE-2024-50051
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

This commit is contained in:

Pei Xiao

2025-03-12 22:51:00 +09:00

committed by

Stefan Bader

parent 7f9812e16f

commit 647535d55a

1 changed files with 1 additions and 0 deletions

									
										drivers/spi/spi-mpc52xx.c
									
		+1
		
												View File
												
				@@ -520,6 +520,7 @@ static void mpc52xx_spi_remove(struct platform_device *op)

					struct mpc52xx_spi *ms = spi_controller_get_devdata(host);

					int i;

					cancel_work_sync(&ms->work);

					free_irq(ms->irq0, ms);

					free_irq(ms->irq1, ms);