diff options
| author | Peter Ujfalusi <peter.ujfalusi@linux.intel.com> | 2023-01-20 11:21:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-01-20 15:09:56 +0100 |
| commit | fb4293600cc651cfe4d48ec489f1d175adf6e2f8 (patch) | |
| tree | 395f10514f3571b9285ce56e2439db105c20849f /sound | |
| parent | ASoC: Intel: set dpcm_capture for amps (diff) | |
| download | linux-fb4293600cc651cfe4d48ec489f1d175adf6e2f8.tar.xz linux-fb4293600cc651cfe4d48ec489f1d175adf6e2f8.zip | |
ASoC: SOF: sof-audio: prepare_widgets: Check swidget for NULL on sink failure
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sof/sof-audio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c index 275b1ae45306..865c367eb2f2 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; } |