ALSA: hda: Error out if invalid stream is being setup

crojewsk-intel · tiwai · commit 084ca216931a · 2022-12-09T09:54:53.000+01:00
Scenario when snd_hdac_stream_setup_periods() receives an instance of struct hdac_stream with neither ->substream nor ->cstream initialized is invalid. Simultaneously addresses "uninitialized symbol 'dmab'" error reported by Smatch. Fixes: 3e95822 ("ALSA: hda: Interrupt servicing and BDL setup for compress streams") Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://lore.kernel.org/r/20221208142635.1514944-1-cezary.rojewski@intel.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c
@@ -500,6 +500,9 @@ int snd_hdac_stream_setup_periods(struct hdac_stream *azx_dev)
 		dmab = snd_pcm_get_dma_buf(substream);
 	} else if (cstream) {
 		dmab = snd_pcm_get_dma_buf(cstream);
+	} else {
+		WARN(1, "No substream or cstream assigned\n");
+		return -EINVAL;
 	}
 
 	/* reset BDL address */

Original file line number	Diff line number	Diff line change
`@@ -500,6 +500,9 @@ int snd_hdac_stream_setup_periods(struct hdac_stream *azx_dev)`
`500`	`500`	`dmab = snd_pcm_get_dma_buf(substream);`
`501`	`501`	`} else if (cstream) {`
`502`	`502`	`dmab = snd_pcm_get_dma_buf(cstream);`
	`503`	`+ } else {`
	`504`	`+ WARN(1, "No substream or cstream assigned\n");`
	`505`	`+ return -EINVAL;`
`503`	`506`	`}`
`504`	`507`
`505`	`508`	`/* reset BDL address */`