diff options
| author | Richard Fitzgerald <rf@opensource.cirrus.com> | 2022-04-04 13:32:52 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-04-06 16:50:04 +0200 |
| commit | 51a630a7051f7f4f1cfdd64c20c7110f9907c230 (patch) | |
| tree | 09c18113d7e165774b3abab5eb18c7456d351d37 /sound | |
| parent | ASoC: meson: aiu: fix duplicate debugfs directory error (diff) | |
| download | linux-51a630a7051f7f4f1cfdd64c20c7110f9907c230.tar.xz linux-51a630a7051f7f4f1cfdd64c20c7110f9907c230.zip | |
ASoC: simple-card-utils: Avoid NULL deref in asoc_simple_set_tdm()
Don't dereference simple_dai before it has been checked for NULL.
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Fixes: 1e974e5b82b3 ("ASoC: audio_graph_card2: Add support for variable slot widths")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20220404113252.1152659-1-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/generic/simple-card-utils.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 8e037835bc58..f2157944247f 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -364,13 +364,15 @@ static int asoc_simple_set_tdm(struct snd_soc_dai *dai, struct snd_pcm_hw_params *params) { int sample_bits = params_width(params); - int slot_width = simple_dai->slot_width; - int slot_count = simple_dai->slots; + int slot_width, slot_count; int i, ret; if (!simple_dai || !simple_dai->tdm_width_map) return 0; + slot_width = simple_dai->slot_width; + slot_count = simple_dai->slots; + if (slot_width == 0) slot_width = sample_bits; |