diff options
| author | Weiguo Li <liwg06@foxmail.com> | 2022-03-10 11:16:48 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-03-11 13:40:54 +0000 |
| commit | 7e4bfcf10a03981cb3056d723bb2f92eead5c0bb (patch) | |
| tree | eb07c4f35e29067b2d597341b02cc268d57bae73 /sound/soc/sof | |
| parent | a174e72e2355b9025205b4b6727bf43047eac6c6 (diff) | |
| download | linux-7e4bfcf10a03981cb3056d723bb2f92eead5c0bb.tar.bz2 | |
ASoC: SOF: compress: fix null check after dereference
"cstream" is dereferenced but null checked later. Swap their
positions to avoid potential null dereference.
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Weiguo Li <liwg06@foxmail.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220310171651.249385-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/compress.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/sof/compress.c b/sound/soc/sof/compress.c index 2af8d75204e9..a8e908e50101 100644 --- a/sound/soc/sof/compress.c +++ b/sound/soc/sof/compress.c @@ -46,8 +46,8 @@ void snd_sof_compr_init_elapsed_work(struct work_struct *work) */ void snd_sof_compr_fragment_elapsed(struct snd_compr_stream *cstream) { - struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_compr_runtime *crtd = cstream->runtime; + struct snd_soc_pcm_runtime *rtd; + struct snd_compr_runtime *crtd; struct snd_soc_component *component; struct snd_compr_tstamp *tstamp; struct snd_sof_pcm *spcm; @@ -55,6 +55,8 @@ void snd_sof_compr_fragment_elapsed(struct snd_compr_stream *cstream) if (!cstream) return; + rtd = cstream->private_data; + crtd = cstream->runtime; tstamp = crtd->private_data; component = snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME); |