Commit ae9e9706 authored by Pei Xiao's avatar Pei Xiao Committed by Zhang Kunbo
Browse files

spi: mpc52xx: Add cancel_work_sync before module remove 

stable inclusion
from stable-v5.10.231
commit e0c6ce8424095c2da32a063d3fc027494c689817
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBJCM5
CVE: CVE-2024-50051

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e0c6ce8424095c2da32a063d3fc027494c689817



--------------------------------

[ 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: ca632f55 ("spi: reorganize drivers")
Signed-off-by: default avatarPei Xiao <xiaopei01@kylinos.cn>
Link: https://patch.msgid.link/1f16f8ae0e50ca9adb1dc849bf2ac65a40c9ceb9.1732783000.git.xiaopei01@kylinos.cn


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhang Kunbo <zhangkunbo@huawei.com>
parent da51139d

drivers/spi/spi-mpc52xx.c

+1 −0
Original line number Diff line number Diff line
@@ -520,6 +520,7 @@ static int mpc52xx_spi_remove(struct platform_device *op) 
	struct mpc52xx_spi *ms = spi_master_get_devdata(master);

	int i;



	cancel_work_sync(&ms->work);

	free_irq(ms->irq0, ms);

	free_irq(ms->irq1, ms);