ASoC: qdsp6: fix a use after free bug in open()
Subsystems (4)
PATCH 1/1 ASoC: qdsp6: fix a use after free bug in open()
This code frees "graph" and then dereferences to save the error code. Save the error code first and then use gotos to unwind the allocation.
--- sound/soc/qcom/qdsp6/q6apm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
sound/soc/qcom/qdsp6/q6apm.c +6 -4
@@ -615,7 +615,7 @@ struct q6apm_graph *q6apm_graph_open(struct device *dev, q6apm_cb cb, graph =kzalloc (sizeof (*graph),GFP_KERNEL );if (!graph) { ret = -ENOMEM ; - goto err; + goto put_ar_graph; } graph->apm = apm;
@@ -631,13 +631,15 @@ struct q6apm_graph *q6apm_graph_open(struct device *dev, q6apm_cb cb, graph->port =gpr_alloc_port (apm->gdev, dev, graph_callback, graph);if (IS_ERR (graph->port)) { -kfree (graph); ret =PTR_ERR (graph->port); - goto err; + goto free_graph; }return graph; -err: + +free_graph: +kfree (graph); +put_ar_graph:kref_put (&ar_graph->refcount, q6apm_put_audioreach_graph);return ERR_PTR (ret); }
Signature · 1 line
2.20.1
Quoted 28 lines · Dan Carpenter
This code frees "graph" and then dereferences to save the error code. Save the error code first and then use gotos to unwind the allocation.
Fixes 59716aa3f976 ("ASoC: qdsp6: Fix an IS_ERR() vs NULL bug")Signed-off-by Dan Carpenter <[email protected]>--- sound/soc/qcom/qdsp6/q6apm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)sound/soc/qcom/qdsp6/q6apm.c +1
-2@@ -615,7 +615,7 @@ struct q6apm_graph *q6apm_graph_open(struct device *dev, q6apm_cb cb, graph =kzalloc (sizeof (*graph),GFP_KERNEL );if (!graph) { ret = -ENOMEM ; - goto err; + goto put_ar_graph; } graph->apm = apm;@@ -631,13 +631,15 @@ struct q6apm_graph *q6apm_graph_open(struct device *dev, q6apm_cb cb, graph->port =gpr_alloc_port (apm->gdev, dev, graph_callback, graph);if (IS_ERR (graph->port)) { -kfree (graph); ret =PTR_ERR (graph->port);
sound/soc/qcom/qdsp6/q6apm.c struct q6apm_graph *q6apm_graph_open(struct device *dev, q6apm_cb cb, · line 642
Quoted 10 lines
sound/soc/qcom/qdsp6/q6apm.c +5
-2- goto err; + goto free_graph; }return graph; -err: + +free_graph: +kfree (graph); +put_ar_graph:
Hello Dan,
The patch looks good! My only suggestion is a readability improvement, but I'm unaware of the convention chosen for qcom directory so you may choose to ignore it:
Function q6apm_graph_open() has two separate return paths: a happy path ending in 'return graph' and an error path which eventually ends with 'return ERR_PTR(ret)'. Current goto label-naming convention suggests it's a happy path nonetheless.
s/free_graph/err_alloc_port/ and s/put_ar_graph/err_alloc_graph/ tells reader upfront that they are in the error path.
Regards,
Czarek
Quoted 4 lines
sound/soc/qcom/qdsp6/q6apm.c +0
-0kref_put (&ar_graph->refcount, q6apm_put_audioreach_graph);return ERR_PTR (ret); }
Quoted 43 lines · Cezary Rojewski
Quoted 25 lines · Dan Carpenter
This code frees "graph" and then dereferences to save the error code. Save the error code first and then use gotos to unwind the allocation.
Fixes 59716aa3f976 ("ASoC: qdsp6: Fix an IS_ERR() vs NULL bug")Signed-off-by Dan Carpenter <[email protected]>--- sound/soc/qcom/qdsp6/q6apm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)sound/soc/qcom/qdsp6/q6apm.c +1
-2@@ -615,7 +615,7 @@ struct q6apm_graph *q6apm_graph_open(struct device *dev, q6apm_cb cb, graph =kzalloc (sizeof (*graph),GFP_KERNEL );if (!graph) { ret = -ENOMEM ; - goto err; + goto put_ar_graph; } graph->apm = apm;@@ -631,13 +631,15 @@ struct q6apm_graph *q6apm_graph_open(struct device *dev, q6apm_cb cb, graph->port =gpr_alloc_port (apm->gdev, dev, graph_callback, graph);if (IS_ERR (graph->port)) { -kfree (graph);sound/soc/qcom/qdsp6/q6apm.c struct q6apm_graph *q6apm_graph_open(struct device *dev, q6apm_cb cb, · line 640
Quoted 10 lines
sound/soc/qcom/qdsp6/q6apm.c +5
-2ret =PTR_ERR (graph->port); - goto err; + goto free_graph; }return graph; -err: + +free_graph: +kfree (graph); +put_ar_graph:Hello Dan,
The patch looks good! My only suggestion is a readability improvement, but I'm unaware of the convention chosen for qcom directory so you may choose to ignore it:
Quoted 8 lines
Function
q6apm_graph_open()has two separate return paths: a happy path ending in 'return graph' and an error path which eventually ends with 'returnERR_PTR(ret)'. Current goto label-naming convention suggests it's a happy path nonetheless.s/free_graph/err_alloc_port/ and s/put_ar_graph/err_alloc_graph/ tells reader upfront that they are in the error path.
Generally when code is indented two tabs that's an error path. The relevant pattern is "Do error handling, not success handling". I guess the if (IS_ERR()) check means it's an error as well.
regards,
dan carpenter
Mark Brown
maintainerQuoted 4 lines · Dan Carpenter
This code frees "graph" and then dereferences to save the error code. Save the error code first and then use gotos to unwind the allocation.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: qdsp6: fix a use after free bug in open()
commit: ac1e6bc146d45e15f0a5c0908338f918f6261388
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark