This is a note to let you know that I've just added the patch titled
ASoC: SOF: sof-audio: prepare_widgets: Check swidget for NULL on sink failure
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-sof-sof-audio-prepare_widgets-check-swidget-for-null-on-sink-failure.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From fb4293600cc651cfe4d48ec489f1d175adf6e2f8 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx>
Date: Fri, 20 Jan 2023 12:21:25 +0200
Subject: ASoC: SOF: sof-audio: prepare_widgets: Check swidget for NULL on sink failure
From: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx>
commit fb4293600cc651cfe4d48ec489f1d175adf6e2f8 upstream.
If the swidget is NULL we skip the preparing of the widget and jump to
handle the sink path of the widget.
If the prepare fails in this case we would undo the prepare but the swidget
is NULL (we skipped the prepare for the widget).
To avoid NULL pointer dereference in this case we must check swidget
against NULL pointer once again.
Fixes: 0ad84b11f2f8 ("ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL")
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Reported-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230120102125.30653-1-peter.ujfalusi@xxxxxxxxxxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/soc/sof/sof-audio.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -327,7 +327,8 @@ sink_prepare:
p->walking = false;
if (ret < 0) {
/* unprepare the source widget */
- if (widget_ops[widget->id].ipc_unprepare && swidget->prepared) {
+ if (widget_ops[widget->id].ipc_unprepare &&
+ swidget && swidget->prepared) {
widget_ops[widget->id].ipc_unprepare(swidget);
swidget->prepared = false;
}
Patches currently in stable-queue which might be from peter.ujfalusi@xxxxxxxxxxxxxxx are
queue-6.1/asoc-sof-sof-audio-prepare_widgets-check-swidget-for-null-on-sink-failure.patch
queue-6.1/asoc-sof-ipc4-mtrace-prevent-underflow-in-sof_ipc4_p.patch
queue-6.1/asoc-sof-keep-prepare-unprepare-widgets-in-sink-path.patch
queue-6.1/asoc-sof-sof-audio-unprepare-when-swidget-use_count-0.patch
queue-6.1/asoc-sof-sof-audio-skip-prepare-unprepare-if-swidget-is-null.patch
