ALSA: compress_offload: dereference after checking for NULL pointer
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Wed, 2 Sep 2020 21:21:21 +0000 (16:21 -0500)
committerTakashi Iwai <tiwai@suse.de>
Thu, 3 Sep 2020 07:25:55 +0000 (09:25 +0200)
Fix cppcheck warning and only dereference once the initial checks are
done:

sound/core/compress_offload.c:516:38: warning: Either the condition
'!stream' is redundant or there is possible null pointer dereference:
stream. [nullPointerRedundantCheck]
 struct snd_compr_runtime *runtime = stream->runtime;
                                     ^
sound/core/compress_offload.c:518:17: note: Assuming that condition
'!stream' is not redundant
if (snd_BUG_ON(!(stream) || !(stream)->runtime))
                ^
sound/core/compress_offload.c:516:38: note: Null pointer dereference
 struct snd_compr_runtime *runtime = stream->runtime;
                                     ^

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20200902212133.30964-7-pierre-louis.bossart@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/compress_offload.c

index 0e53f6f319167c9e4dd3b1e342bf6b8e2fe1f321..e3eb314acb106806e8de53b3ca2e72d08eeb4589 100644 (file)
@@ -513,10 +513,11 @@ EXPORT_SYMBOL(snd_compr_malloc_pages);
 
 int snd_compr_free_pages(struct snd_compr_stream *stream)
 {
-       struct snd_compr_runtime *runtime = stream->runtime;
+       struct snd_compr_runtime *runtime;
 
        if (snd_BUG_ON(!(stream) || !(stream)->runtime))
                return -EINVAL;
+       runtime = stream->runtime;
        if (runtime->dma_area == NULL)
                return 0;
        if (runtime->dma_buffer_p != &stream->dma_buffer) {