Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

spmi: mediatek: Fix UAF on device remove

The pmif driver data that contains the clocks is allocated along with
spmi_controller.
On device remove, spmi_controller will be freed first, and then devres
, including the clocks, will be cleanup.
This leads to UAF because putting the clocks will access the clocks in
the pmif driver data, which is already freed along with spmi_controller.

This can be reproduced by enabling DEBUG_TEST_DRIVER_REMOVE and
building the kernel with KASAN.

Fix the UAF issue by using unmanaged clk_bulk_get() and putting the
clocks before freeing spmi_controller.

Reported-by: Fei Shao <fshao@chromium.org>
Signed-off-by: Yu-Che Cheng <giver@chromium.org>
Link: https://lore.kernel.org/r/20230717173934.1.If004a6e055a189c7f2d0724fa814422c26789839@changeid
Tested-by: Fei Shao <fshao@chromium.org>
Reviewed-by: Fei Shao <fshao@chromium.org>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20231206231733.4031901-3-sboyd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Yu-Che Cheng and committed by
Greg Kroah-Hartman
e821d50a f200fff8

+5 -2
+5 -2
drivers/spmi/spmi-mtk-pmif.c
··· 475 475 for (i = 0; i < arb->nclks; i++) 476 476 arb->clks[i].id = pmif_clock_names[i]; 477 477 478 - err = devm_clk_bulk_get(&pdev->dev, arb->nclks, arb->clks); 478 + err = clk_bulk_get(&pdev->dev, arb->nclks, arb->clks); 479 479 if (err) { 480 480 dev_err(&pdev->dev, "Failed to get clocks: %d\n", err); 481 481 goto err_put_ctrl; ··· 484 484 err = clk_bulk_prepare_enable(arb->nclks, arb->clks); 485 485 if (err) { 486 486 dev_err(&pdev->dev, "Failed to enable clocks: %d\n", err); 487 - goto err_put_ctrl; 487 + goto err_put_clks; 488 488 } 489 489 490 490 ctrl->cmd = pmif_arb_cmd; ··· 510 510 511 511 err_domain_remove: 512 512 clk_bulk_disable_unprepare(arb->nclks, arb->clks); 513 + err_put_clks: 514 + clk_bulk_put(arb->nclks, arb->clks); 513 515 err_put_ctrl: 514 516 spmi_controller_put(ctrl); 515 517 return err; ··· 523 521 struct pmif *arb = spmi_controller_get_drvdata(ctrl); 524 522 525 523 clk_bulk_disable_unprepare(arb->nclks, arb->clks); 524 + clk_bulk_put(arb->nclks, arb->clks); 526 525 spmi_controller_remove(ctrl); 527 526 spmi_controller_put(ctrl); 528 527 }