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-18 21:15:55 +0300
commit9a520938980b8b7cf0e16f1ef61fac91fb0e8e31 (patch)
tree507fa7ec4ed7727b6ee8ce2d56cbdbffa9aa00e3 /sound/synth
parentb875f9be6275a53c4532a3a649953cebb2722118 (diff)
downloadlinux-9a520938980b8b7cf0e16f1ef61fac91fb0e8e31.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 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 */