| Message ID | 20210519100713.879958-1-jaska.uimonen@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b9c035aa43b8c074b3bcfdaaa8bea2537d85b7c3 |
| Headers | show |
| Series | ASoC: topology: Fix using uninitialized pointer | expand |
On Wed, 19 May 2021 13:07:13 +0300, Jaska Uimonen wrote: > The original patch changed kcontrol_type to a pointer. In some goto > cases the pointer is assigned into a struct member as uninitialized and > this will cause a runtime error with UBSan even if it isn't a real bug. > So initialize the pointer to NULL. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: topology: Fix using uninitialized pointer commit: b9c035aa43b8c074b3bcfdaaa8bea2537d85b7c3 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
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index e71d98d7b116..5e65b72910e9 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1422,7 +1422,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, struct snd_soc_dapm_widget template, *widget; struct snd_soc_tplg_ctl_hdr *control_hdr; struct snd_soc_card *card = tplg->comp->card; - unsigned int *kcontrol_type; + unsigned int *kcontrol_type = NULL; struct snd_kcontrol_new *kc; int mixer_count = 0; int bytes_count = 0;
The original patch changed kcontrol_type to a pointer. In some goto cases the pointer is assigned into a struct member as uninitialized and this will cause a runtime error with UBSan even if it isn't a real bug. So initialize the pointer to NULL. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Fixes: d29d41e28eea ("ASoC: topology: Add support for multiple kcontrol types to a widget") Signed-off-by: Jaska Uimonen <jaska.uimonen@linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)