Skip to contentSkip to conversation

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

PATCH In review Peter Ujfalusi 3 participants 3 messages Jan 20, 2023

Subsystems (4)
Memory management Sound ASoC Sound - sound open firmware (SOF) drivers
lore
Share & tools
lore

Peter Ujfalusi

author maintainer
#0 lore raw

PATCH 1/1 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 <[email protected]>
Reported-by Dan Carpenter <[email protected]>
Signed-off-by Peter Ujfalusi <[email protected]>
---
 sound/soc/sof/sof-audio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/sof/sof-audio.c +2 -1
index f17d405a9da9..2dff3ae25d27 100644
@@ -334,7 +334,8 @@ sof_prepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget
 			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;
 				}
Signature · 1 line
2.39.0
Reviewed-by on v1 1/1
#1 lore raw

Il 20/01/23 11:21, Peter Ujfalusi ha scritto:

Quoted 5 lines

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).

Quoted 8 lines

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 <[email protected]>
Reported-by Dan Carpenter <[email protected]>
Signed-off-by Peter Ujfalusi <[email protected]>
Reviewed-by AngeloGioacchino Del Regno <[email protected]>
maintainer
#2 lore raw
In reply to Peter Ujfalusi
Quoted 9 lines · Peter Ujfalusi

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.

[...]

Applied to

broonie/sound.git for-next

Thanks!

[1/1] ASoC: SOF: sof-audio: prepare_widgets: Check swidget for NULL on sink failure

      commit: fb4293600cc651cfe4d48ec489f1d175adf6e2f8

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