summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-04 14:34:00 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-05 11:05:26 +0100
commit6ce1d63ed7210e7120070297976460f868c36314 (patch)
treed5759f217a1e21bfe555e8f609dd54bacc1ab1b4
parentASoC: sh: Avoid passing NULL to memory allocators (diff)
downloadlinux-6ce1d63ed7210e7120070297976460f868c36314.tar.xz
linux-6ce1d63ed7210e7120070297976460f868c36314.zip
ALSA: core: Don't allow NULL device for memory allocation
Since we covered all callers with NULL device pointer, let's catch the remaining calls with NULL and warn explicitly. Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/core/memalloc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index 59a4adc286ed..eb974235c92b 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -182,6 +182,8 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,
return -ENXIO;
if (WARN_ON(!dmab))
return -ENXIO;
+ if (WARN_ON(!device))
+ return -EINVAL;
dmab->dev.type = type;
dmab->dev.dev = device;