aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAustin Kim <austin.kim@lge.com>2021-11-09 00:37:42 +0000
committerTakashi Iwai <tiwai@suse.de>2021-11-09 07:18:50 +0100
commitd159037abbe3412285c271bdfb9cdf19e62678ff (patch)
tree194a0d26b55f2b38903eeaa213a1fbeb388b30ed
parentALSA: memalloc: Use proper SG helpers for noncontig allocations (diff)
downloadlinux-dev-d159037abbe3412285c271bdfb9cdf19e62678ff.tar.xz
linux-dev-d159037abbe3412285c271bdfb9cdf19e62678ff.zip
ALSA: synth: missing check for possible NULL after the call to kstrdup
If kcalloc() return NULL due to memory starvation, it is possible for kstrdup() to return NULL in similar case. So add null check after the call to kstrdup() is made. [ minor coding-style fix by tiwai ] Signed-off-by: Austin Kim <austin.kim@lge.com> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20211109003742.GA5423@raspberrypi Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/synth/emux/emux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index 49d1976a132c..5ed8e36d2e04 100644
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -88,7 +88,7 @@ int snd_emux_register(struct snd_emux *emu, struct snd_card *card, int index, ch
emu->name = kstrdup(name, GFP_KERNEL);
emu->voices = kcalloc(emu->max_voices, sizeof(struct snd_emux_voice),
GFP_KERNEL);
- if (emu->voices == NULL)
+ if (emu->name == NULL || emu->voices == NULL)
return -ENOMEM;
/* create soundfont list */