summaryrefslogtreecommitdiff
path: root/sound/synth
diff options
context:
space:
mode:
authorAustin Kim <austin.kim@lge.com>2021-11-09 03:37:42 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-26 13:35:58 +0300
commite053651f048d826a80c883cfe80200387bbdc5c5 (patch)
tree7bd5e35f52527e9fe19b2f222de42666567bcc46 /sound/synth
parent76711240dc51b637a5b54b25767f69a4d07c3806 (diff)
downloadlinux-e053651f048d826a80c883cfe80200387bbdc5c5.tar.xz
ALSA: synth: missing check for possible NULL after the call to kstrdup
commit d159037abbe3412285c271bdfb9cdf19e62678ff upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/synth')
-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 64f3141a3e1b..d8140ad98d5f 100644
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -101,7 +101,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 */