Skip to content

Commit bc3889a

Browse files
gjiangcanonicalgregkh
authored andcommitted
media: mtk-jpeg: Fix null-ptr-deref during unload module
commit 17af2b3 upstream. The workqueue should be destroyed in mtk_jpeg_core.c since commit 09aea13 ("media: mtk-jpeg: refactor some variables"), otherwise the below calltrace can be easily triggered. [ 677.862514] Unable to handle kernel paging request at virtual address dfff800000000023 [ 677.863633] KASAN: null-ptr-deref in range [0x0000000000000118-0x000000000000011f] ... [ 677.879654] CPU: 6 PID: 1071 Comm: modprobe Tainted: G O 6.8.12-mtk+gfa1a78e5d24b+ #17 ... [ 677.882838] pc : destroy_workqueue+0x3c/0x770 [ 677.883413] lr : mtk_jpegdec_destroy_workqueue+0x70/0x88 [mtk_jpeg_dec_hw] [ 677.884314] sp : ffff80008ad974f0 [ 677.884744] x29: ffff80008ad974f0 x28: ffff0000d7115580 x27: ffff0000dd691070 [ 677.885669] x26: ffff0000dd691408 x25: ffff8000844af3e0 x24: ffff80008ad97690 [ 677.886592] x23: ffff0000e051d400 x22: ffff0000dd691010 x21: dfff800000000000 [ 677.887515] x20: 0000000000000000 x19: 0000000000000000 x18: ffff800085397ac0 [ 677.888438] x17: 0000000000000000 x16: ffff8000801b87c8 x15: 1ffff000115b2e10 [ 677.889361] x14: 00000000f1f1f1f1 x13: 0000000000000000 x12: ffff7000115b2e4d [ 677.890285] x11: 1ffff000115b2e4c x10: ffff7000115b2e4c x9 : ffff80000aa43e90 [ 677.891208] x8 : 00008fffeea4d1b4 x7 : ffff80008ad97267 x6 : 0000000000000001 [ 677.892131] x5 : ffff80008ad97260 x4 : ffff7000115b2e4d x3 : 0000000000000000 [ 677.893054] x2 : 0000000000000023 x1 : dfff800000000000 x0 : 0000000000000118 [ 677.893977] Call trace: [ 677.894297] destroy_workqueue+0x3c/0x770 [ 677.894826] mtk_jpegdec_destroy_workqueue+0x70/0x88 [mtk_jpeg_dec_hw] [ 677.895677] devm_action_release+0x50/0x90 [ 677.896211] release_nodes+0xe8/0x170 [ 677.896688] devres_release_all+0xf8/0x178 [ 677.897219] device_unbind_cleanup+0x24/0x170 [ 677.897785] device_release_driver_internal+0x35c/0x480 [ 677.898461] device_release_driver+0x20/0x38 ... [ 677.912665] ---[ end trace 0000000000000000 ]--- Fixes: 09aea13 ("media: mtk-jpeg: refactor some variables") Cc: <[email protected]> Signed-off-by: Guoqing Jiang <[email protected]> Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5ade59d commit bc3889a

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c

+10
Original file line numberDiff line numberDiff line change
@@ -1293,6 +1293,11 @@ static int mtk_jpeg_single_core_init(struct platform_device *pdev,
12931293
return 0;
12941294
}
12951295

1296+
static void mtk_jpeg_destroy_workqueue(void *data)
1297+
{
1298+
destroy_workqueue(data);
1299+
}
1300+
12961301
static int mtk_jpeg_probe(struct platform_device *pdev)
12971302
{
12981303
struct mtk_jpeg_dev *jpeg;
@@ -1337,6 +1342,11 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
13371342
| WQ_FREEZABLE);
13381343
if (!jpeg->workqueue)
13391344
return -EINVAL;
1345+
ret = devm_add_action_or_reset(&pdev->dev,
1346+
mtk_jpeg_destroy_workqueue,
1347+
jpeg->workqueue);
1348+
if (ret)
1349+
return ret;
13401350
}
13411351

13421352
ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev);

drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c

-11
Original file line numberDiff line numberDiff line change
@@ -578,11 +578,6 @@ static int mtk_jpegdec_hw_init_irq(struct mtk_jpegdec_comp_dev *dev)
578578
return 0;
579579
}
580580

581-
static void mtk_jpegdec_destroy_workqueue(void *data)
582-
{
583-
destroy_workqueue(data);
584-
}
585-
586581
static int mtk_jpegdec_hw_probe(struct platform_device *pdev)
587582
{
588583
struct mtk_jpegdec_clk *jpegdec_clk;
@@ -606,12 +601,6 @@ static int mtk_jpegdec_hw_probe(struct platform_device *pdev)
606601
dev->plat_dev = pdev;
607602
dev->dev = &pdev->dev;
608603

609-
ret = devm_add_action_or_reset(&pdev->dev,
610-
mtk_jpegdec_destroy_workqueue,
611-
master_dev->workqueue);
612-
if (ret)
613-
return ret;
614-
615604
spin_lock_init(&dev->hw_lock);
616605
dev->hw_state = MTK_JPEG_HW_IDLE;
617606

0 commit comments

Comments
 (0)