From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Date: Fri, 20 Jan 2023 10:21:25 +0000 (+0200)
Subject: ASoC: SOF: sof-audio: prepare_widgets: Check swidget for NULL on sink failure
X-Git-Tag: baikal/aarch64/sdk6.1~15
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=729ddeadd3453ced7a4fe2047744229c9994872a;p=kernel.git

ASoC: SOF: sof-audio: prepare_widgets: Check swidget for NULL on sink failure

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@intel.com>
Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20230120102125.30653-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index 18af3e5ec6ae7..2df433c6ef55f 100644
--- 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;
 				}