Skip to content

Commit 2ae0ab0

Browse files
ccpalexbroonie
authored andcommitted
spi: lpspi: Avoid potential use-after-free in probe()
fsl_lpspi_probe() is allocating/disposing memory manually with spi_alloc_host()/spi_alloc_target(), but uses devm_spi_register_controller(). In case of error after the latter call the memory will be explicitly freed in the probe function by spi_controller_put() call, but used afterwards by "devm" management outside probe() (spi_unregister_controller() <- devm_spi_unregister() below). Unable to handle kernel NULL pointer dereference at virtual address 0000000000000070 ... Call trace: kernfs_find_ns kernfs_find_and_get_ns sysfs_remove_group sysfs_remove_groups device_remove_attrs device_del spi_unregister_controller devm_spi_unregister release_nodes devres_release_all really_probe driver_probe_device __device_attach_driver bus_for_each_drv __device_attach device_initial_probe bus_probe_device deferred_probe_work_func process_one_work worker_thread kthread ret_from_fork Fixes: 5314987 ("spi: imx: add lpspi bus driver") Signed-off-by: Alexander Sverdlin <[email protected]> Link: https://msgid.link/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent be84be4 commit 2ae0ab0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/spi/spi-fsl-lpspi.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -830,11 +830,11 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
830830

831831
is_target = of_property_read_bool((&pdev->dev)->of_node, "spi-slave");
832832
if (is_target)
833-
controller = spi_alloc_target(&pdev->dev,
834-
sizeof(struct fsl_lpspi_data));
833+
controller = devm_spi_alloc_target(&pdev->dev,
834+
sizeof(struct fsl_lpspi_data));
835835
else
836-
controller = spi_alloc_host(&pdev->dev,
837-
sizeof(struct fsl_lpspi_data));
836+
controller = devm_spi_alloc_host(&pdev->dev,
837+
sizeof(struct fsl_lpspi_data));
838838

839839
if (!controller)
840840
return -ENOMEM;

0 commit comments

Comments
 (0)