2023-05-17 16:41:58

by Krzysztof Kozlowski

Subject: [PATCH] soundwire: qcom: add proper error paths in qcom_swrm_startup()

Reverse actions in qcom_swrm_startup() error paths to avoid leaking
stream memory and keeping runtime PM unbalanced.

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
drivers/soundwire/qcom.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index f442280af9d3..baaa75320ae3 100644
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -1208,8 +1208,10 @@ static int qcom_swrm_startup(struct snd_pcm_substream *substream,
}

sruntime = sdw_alloc_stream(dai->name);
- if (!sruntime)
- return -ENOMEM;
+ if (!sruntime) {
+ ret = -ENOMEM;
+ goto err_alloc;
+ }

ctrl->sruntime[dai->id] = sruntime;

@@ -1219,12 +1221,19 @@ static int qcom_swrm_startup(struct snd_pcm_substream *substream,
if (ret < 0 && ret != -ENOTSUPP) {
dev_err(dai->dev, "Failed to set sdw stream on %s\n",
codec_dai->name);
- sdw_release_stream(sruntime);
- return ret;
+ goto err_set_stream;
}
}

return 0;
+
+err_set_stream:
+ sdw_release_stream(sruntime);
+err_alloc:
+ pm_runtime_mark_last_busy(ctrl->dev);
+ pm_runtime_put_autosuspend(ctrl->dev);
+
+ return ret;
}

static void qcom_swrm_shutdown(struct snd_pcm_substream *substream,
--
2.34.1

2023-05-17 16:54:37

by Pierre-Louis Bossart

Subject: Re: [PATCH] soundwire: qcom: add proper error paths in qcom_swrm_startup()

On 5/17/23 11:37, Krzysztof Kozlowski wrote:
> Reverse actions in qcom_swrm_startup() error paths to avoid leaking
> stream memory and keeping runtime PM unbalanced.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>

Reviewed-by: Pierre-Louis Bossart <[email protected]>

2023-05-27 11:29:52

by Vinod Koul

Subject: Re: [PATCH] soundwire: qcom: add proper error paths in qcom_swrm_startup()

On 17-05-23, 18:37, Krzysztof Kozlowski wrote:
> Reverse actions in qcom_swrm_startup() error paths to avoid leaking
> stream memory and keeping runtime PM unbalanced.

Applied, thanks

--
~Vinod