Unverified Commit de6aa72b authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: ipc4-topology: Clarify bind failure caused by missing fw_module 



The original patch uses a feature in lib/vsprintf.c to handle the invalid
address when tring to print *_fw_module->man4_module_entry.name when the
*rc_fw_module is NULL.
This case is handled by check_pointer_msg() internally and turns the
invalid pointer to '(efault)' for printing but it is hiding useful
information about the circumstances. Change the print to emmit the name
of the widget and a note on which side's fw_module is missing.

Fixes: e3720f92 ("ASoC: SOF: avoid a NULL dereference with unsupported widgets")
Reported-by: default avatarDan Carpenter <error27@gmail.com>
Link: https://lore.kernel.org/alsa-devel/4826f662-42f0-4a82-ba32-8bf5f8a03256@kili.mountain/


Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Rule: 'Cc: stable@vger.kernel.org' or 'commit <sha1> upstream.'
Link: https://lore.kernel.org/r/20230403090909.18233-1-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e3720f92

sound/soc/sof/ipc4-topology.c

+6 −4
Original line number Diff line number Diff line
@@ -1806,10 +1806,12 @@ static int sof_ipc4_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route * 
	int ret;



	if (!src_fw_module || !sink_fw_module) {

		/* The NULL module will print as "(efault)" */

		dev_err(sdev->dev, "source %s or sink %s widget weren't set up properly\n",

			src_fw_module->man4_module_entry.name,

			sink_fw_module->man4_module_entry.name);

		dev_err(sdev->dev,

			"cannot bind %s -> %s, no firmware module for: %s%s\n",

			src_widget->widget->name, sink_widget->widget->name,

			src_fw_module ? "" : " source",

			sink_fw_module ? "" : " sink");



		return -ENODEV;

	}