Skip to content

Commit

Permalink
ASoC: topology: Fix using uninitialized pointer
Browse files Browse the repository at this point in the history
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: d29d41e ("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>
Link: https://lore.kernel.org/r/20210519100713.879958-1-jaska.uimonen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Jaska Uimonen authored and Mark Brown committed May 20, 2021
1 parent 6033907 commit b9c035a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/soc-topology.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b9c035a

Please sign in to comment.