dmaengine: imx-sdma: fix use-after-free on probe error path
Subsystems (2)
PATCH 1/1 dmaengine: imx-sdma: fix use-after-free on probe error path
If probe() fails anywhere beyond the point where sdma_get_firmware() is called, then a kernel oops may occur.
Problematic sequence of events:
1. probe() calls sdma_get_firmware(), which schedules the firmware callback to run when firmware becomes available, using the sdma instance structure as the context
2. probe() encounters an error, which deallocates the sdma instance structure
3. firmware becomes available, firmware callback is called with deallocated sdma instance structure
4. use after free - kernel oops !
Solution: only attempt to load firmware when we're certain that probe() will succeed. This guarantees that the firmware callback's context will remain valid.
Note that the remove() path is unaffected by this issue: the firmware loader will increment the driver module's use count, ensuring that the module cannot be unloaded while the firmware callback is pending or running.
To: Robin Gong <[email protected]>
--- drivers/dma/imx-sdma.c | 48 ++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 21 deletions(-)
drivers/dma/imx-sdma.c +27 -21
@@ -2096,27 +2096,6 @@ static int sdma_probe(struct platform_device *pdev)if (pdata && pdata->script_addrs)sdma_add_scripts (sdma, pdata->script_addrs); -if (pdata) { - ret =sdma_get_firmware (sdma, pdata->fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware from platform data\n" ); - }else { -/* -* Because that device tree does not encode ROM script address, -* the RAM script in firmware is mandatory for device tree -* probe, otherwise it fails. -*/ - ret =of_property_read_string (np,"fsl,sdma-ram-script-name" , - &fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware name\n" ); -else { - ret =sdma_get_firmware (sdma, fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware from device tree\n" ); - } - } - sdma->dma_device.dev = &pdev->dev; sdma->dma_device.device_alloc_chan_resources = sdma_alloc_chan_resources;
@@ -2161,6 +2140,33 @@ static int sdma_probe(struct platform_device *pdev)of_node_put (spba_bus); } +/* +* Kick off firmware loading as the very last step: +* attempt to load firmware only if we're not on the error path, because +* the firmware callback requires a fully functional and allocated sdma +* instance. +*/ +if (pdata) { + ret =sdma_get_firmware (sdma, pdata->fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware from platform data\n" ); + }else { +/* +* Because that device tree does not encode ROM script address, +* the RAM script in firmware is mandatory for device tree +* probe, otherwise it fails. +*/ + ret =of_property_read_string (np,"fsl,sdma-ram-script-name" , + &fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware name\n" ); +else { + ret =sdma_get_firmware (sdma, fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware from device tree\n" ); + } + } +return 0 ; err_register:
Signature · 1 line
2.17.1
Quoted 114 lines
-----Original Message-----
From: Sven Van Asbroeck <[email protected]>
Subject: [PATCH] dmaengine: imx-sdma: fix use-after-free on probe error pathIf
probe()fails anywhere beyond the point wheresdma_get_firmware()is called, then a kernel oops may occur.Problematic sequence of events:
1.probe()callssdma_get_firmware(), which schedules the firmware callback to run when firmware becomes available, using the sdma instance structure as the context 2.probe()encounters an
error, which deallocates the
sdma instance structure
3. firmware becomes available, firmware callback is
called with deallocated sdma instance structure 4. use after free - kernel
oops !Solution: only attempt to load firmware when we're certain that
probe()will succeed. This guarantees that the firmware callback's context will remain valid.Note that the
remove()path is unaffected by this issue: the firmware loader will increment the driver module's use count, ensuring that the module cannot be unloaded while the firmware callback is pending or running.To: Robin Gong <[email protected]>
Cc Vinod Koul <[email protected]>Cc Dan Williams <[email protected]>Cc Shawn Guo <[email protected]>Cc Sascha Hauer <[email protected]>Cc Pengutronix Kernel Team <[email protected]>Cc Fabio Estevam <[email protected]>Cc NXP Linux Team <[email protected]>Signed-off-by Sven Van Asbroeck <[email protected]>--- drivers/dma/imx-sdma.c | 48 ++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 21 deletions(-)drivers/dma/imx-sdma.c index renamed from drivers/dma/imx-sdma.c +0
-0
99d9f431ae2c..3f0f41d16e1c100644drivers/dma/imx-sdma.c +0
-21@@ -2096,27 +2096,6 @@ static int sdma_probe(struct platform_device *pdev) if (pdata && pdata->script_addrs) sdma_add_scripts(sdma, pdata->script_addrs); -if (pdata) { - ret =sdma_get_firmware (sdma, pdata->fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware from platform data\n"); - }else { -/* -* Because that device tree does not encode ROM script address, -* the RAM script in firmware is mandatory for device tree -* probe, otherwise it fails. -*/ - ret =of_property_read_string (np,"fsl,sdma-ram-script-name" , - &fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware name\n" ); -else { - ret =sdma_get_firmware (sdma, fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware from device tree\n"); - } - } -drivers/dma/imx-sdma.c +0
-0sdma->dma_device.dev = &pdev->dev; sdma->dma_device.device_alloc_chan_resources =
sdma_alloc_chan_resources; @@ -2161,6 +2140,33 @@ static intsdma_probe(struct platform_device *pdev)drivers/dma/imx-sdma.c +10
-0of_node_put (spba_bus); } +/* +* Kick off firmware loading as the very last step: +* attempt to load firmware only if we're not on the error path, because +* the firmware callback requires a fully functional and allocated sdma +* instance. +*/ +if (pdata) { + ret =sdma_get_firmware (sdma, pdata->fw_name); +if (ret) + dev_warn(&pdev->dev, "failed to get firmware from platformdata\n");
drivers/dma/imx-sdma.c +14
-0+ }else { +/* +* Because that device tree does not encode ROM script address, +* the RAM script in firmware is mandatory for device tree +* probe, otherwise it fails. +*/ + ret =of_property_read_string (np,"fsl,sdma-ram-script-name" , + &fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware name\n" ); +else { + ret =sdma_get_firmware (sdma, fw_name); +if (ret) + dev_warn(&pdev->dev, "failed to get firmware from devicetree\n");
drivers/dma/imx-sdma.c +3
-1+ } + } +return 0 ; err_register: --2.17.1
Vinod Koul
maintainerQuoted 84 lines · Sven Van Asbroeck
If
probe()fails anywhere beyond the point wheresdma_get_firmware()is called, then a kernel oops may occur.Problematic sequence of events:
1.probe()callssdma_get_firmware(), which schedules the firmware callback to run when firmware becomes available, using the sdma instance structure as the context
2.probe()encounters an error, which deallocates the sdma instance structure
3. firmware becomes available, firmware callback is called with deallocated sdma instance structure
4. use after free - kernel oops !Solution: only attempt to load firmware when we're certain that
probe()will succeed. This guarantees that the firmware callback's context will remain valid.Note that the
remove()path is unaffected by this issue: the firmware loader will increment the driver module's use count, ensuring that the module cannot be unloaded while the firmware callback is pending or running.To: Robin Gong <[email protected]>
Cc Vinod Koul <[email protected]>Cc Dan Williams <[email protected]>Cc Shawn Guo <[email protected]>Cc Sascha Hauer <[email protected]>Cc Pengutronix Kernel Team <[email protected]>Cc Fabio Estevam <[email protected]>Cc NXP Linux Team <[email protected]>Signed-off-by Sven Van Asbroeck <[email protected]>--- drivers/dma/imx-sdma.c | 48 ++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 21 deletions(-)drivers/dma/imx-sdma.c +10
-21@@ -2096,27 +2096,6 @@ static int sdma_probe(struct platform_device *pdev)if (pdata && pdata->script_addrs)sdma_add_scripts (sdma, pdata->script_addrs); -if (pdata) { - ret =sdma_get_firmware (sdma, pdata->fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware from platform data\n" ); - }else { -/* -* Because that device tree does not encode ROM script address, -* the RAM script in firmware is mandatory for device tree -* probe, otherwise it fails. -*/ - ret =of_property_read_string (np,"fsl,sdma-ram-script-name" , - &fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware name\n" ); -else { - ret =sdma_get_firmware (sdma, fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware from device tree\n" ); - } - } - sdma->dma_device.dev = &pdev->dev; sdma->dma_device.device_alloc_chan_resources = sdma_alloc_chan_resources;@@ -2161,6 +2140,33 @@ static int sdma_probe(struct platform_device *pdev)of_node_put (spba_bus); } +/* +* Kick off firmware loading as the very last step: +* attempt to load firmware only if we're not on the error path, because +* the firmware callback requires a fully functional and allocated sdma +* instance. +*/ +if (pdata) { + ret =sdma_get_firmware (sdma, pdata->fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware from platform data\n" );
drivers/dma/imx-sdma.c static int sdma_probe(struct platform_device *pdev) · line 2162
Quoted 10 lines
drivers/dma/imx-sdma.c +10
-0+ }else { +/* +* Because that device tree does not encode ROM script address, +* the RAM script in firmware is mandatory for device tree +* probe, otherwise it fails. +*/ + ret =of_property_read_string (np,"fsl,sdma-ram-script-name" , + &fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware name\n" );
if should have braces!
Quoted 12 lines
drivers/dma/imx-sdma.c +7
-0+else { + ret =sdma_get_firmware (sdma, fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware from device tree\n" ); + } + } +return 0 ; err_register:Signature · 1 line
2.17.1
Applied after fixing braces!
Signature · 1 line
~Vinod
Hi Vinod,
Quoted 6 lines · Vinod Koul
Review
Quoted 3 lines
(quoted diff) +2
-0+ if (ret) + dev_warn(&pdev->dev, "failed to get firmware name\n");if should have braces!
Applied after fixing braces!
checkpatch.pl output after adding braces:
WARNING: braces {} are not necessary for single statement blocks #102: FILE: drivers/dma/imx-sdma.c:2165:
+ if (ret) {
+ dev_warn(&pdev->dev, "failed to get firmware from device tree\n");
+ }
total: 0 errors, 1 warnings, 61 lines checked
Vinod Koul
maintainerOn 24-06-19, 10:07, Sven Van Asbroeck wrote:
Quoting orignal patch for better context:
Quoted 21 lines
drivers/dma/imx-sdma.c +21
-0+if (pdata) { + ret =sdma_get_firmware (sdma, pdata->fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware from platform data\n" ); + }else { +/* +* Because that device tree does not encode ROM script address, +* the RAM script in firmware is mandatory for device tree +* probe, otherwise it fails. +*/ + ret =of_property_read_string (np,"fsl,sdma-ram-script-name" , + &fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware name\n" ); +else { + ret =sdma_get_firmware (sdma, fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware from device tree\n" ); + } + } +
Quoted 10 lines · Sven Van Asbroeck
Hi Vinod,
Quoted 6 lines · Vinod Koul
Review
Quoted 3 lines
(quoted diff) +2
-0+ if (ret) + dev_warn(&pdev->dev, "failed to get firmware name\n");if should have braces!
Applied after fixing braces!
Quoted 7 lines
checkpatch.pl output after adding braces:
WARNING: braces {} are not necessary for single statement blocks #102: FILE:
drivers/dma/imx-sdma.c:2165:
+ if (ret) {
+dev_warn(&pdev->dev, "failed to get firmware from device tree\n");
+ }
there is an else here too!
With the patch the checkpatch warns:
CHECK: braces {} should be used on all arms of this statement #201: FILE: drivers/dma/imx-sdma.c:2161:
+ if (ret)
[...]
+ else {
[...]
Even if the if is a single block and else being multi block, if would need matching brances. With the change pushed:
total: 0 errors, 0 warnings, 0 checks, 60 lines checked
Signature · 1 line
~Vinod
Hi Vinod,
Quoted 3 lines · Vinod Koul
there is an else here too!
You are of course right, I was looking at the wrong if.
Apologies for the confusion, I did try to look at what you changed, but your git repo listed in MAINTAINERS appears unresponsive for me?
Thanks, Sven
Fabio Estevam
reviewerQuoted 5 lines · Sven Van Asbroeck
You are of course right, I was looking at the wrong if.
Apologies for the confusion, I did try to look at what you changed, but your git repo listed in
MAINTAINERSappears unresponsive for me?
Works fine here:
https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma.git/commit/?h=fixes&id=2b8066c3deb9140fdf258417a51479b2aeaa7622
Vinod Koul
maintainerQuoted 8 lines · Sven Van Asbroeck
Hi Vinod,
Quoted 3 lines · Vinod Koul
there is an else here too!
You are of course right, I was looking at the wrong if.
NO issues :)
Quoted 4 lines
Apologies for the confusion, I did try to look at what you changed, but your git repo listed in
MAINTAINERSappears unresponsive for me?
To quote David you need to move to 21st century (like me). IPv4 switch for infradead is down so...
meanwhile this would work too:
git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma.git
Signature · 1 line
~Vinod
Quoted 2 lines · Vinod Koul
To quote David you need to move to 21st century (like me).
So true :)
Your MAINTAINERS entry in linux-next is still pointing to infradead, though. But that's becoming less and less useful, now that most developers are moving to kernel.org ...
Hi,
Quoted 10 lines · On Fri, 5 Jul 2019 08:26:12 -0400 Sven Van Asbroeck wrote:
Hi Vinod,
Quoted 6 lines · Vinod Koul
Review
Quoted 3 lines
(quoted diff) +2
-0+ if (ret) + dev_warn(&pdev->dev, "failed to get firmware name\n");if should have braces!
Applied after fixing braces!
Quoted 8 lines
checkpatch.pl output after adding braces:
WARNING: braces {} are not necessary for single statement blocks #102: FILE:
drivers/dma/imx-sdma.c:2165:
+ if (ret) {
+dev_warn(&pdev->dev, "failed to get firmware from device tree\n");
+ }
You changed the braces in the wrong place!
The comment applied to the previous 'if (ret)' which has an else clause with braces, so the if clause needs braces too.
Lothar Waßmann