2021-11-09 01:10:54

by Austin Kim

Subject: [PATCH] ALSA: missing check for possible NULL after the call to kstrdup

From: Austin Kim <[email protected]>

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.

Signed-off-by: Austin Kim <[email protected]>
---
sound/synth/emux/emux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index 49d1976a132c..6dab3c5bac00 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 */
--
2.20.1

2021-11-09 14:45:47

by Takashi Iwai

Subject: Re: [PATCH] ALSA: missing check for possible NULL after the call to kstrdup

On Tue, 09 Nov 2021 01:37:42 +0100,
Austin Kim wrote:
>
> From: Austin Kim <[email protected]>
>
> 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.
>
> Signed-off-by: Austin Kim <[email protected]>

Thanks, applied now with a minor coding-style fix (we need no extra
parentheses), the correction of the subject line with the proper
prefix, and the addition of Cc-to-stable.


Takashi

2021-11-09 15:34:41

by Austin Kim

Subject: Re: [PATCH] ALSA: missing check for possible NULL after the call to kstrdup

2021년 11월 9일 (화) 오후 3:24, Takashi Iwai <[email protected]>님이 작성:
>
> On Tue, 09 Nov 2021 01:37:42 +0100,
> Austin Kim wrote:
> >
> > From: Austin Kim <[email protected]>
> >
> > 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.
> >
> > Signed-off-by: Austin Kim <[email protected]>
>
> Thanks, applied now with a minor coding-style fix (we need no extra
> parentheses), the correction of the subject line with the proper
> prefix, and the addition of Cc-to-stable.
>

Great, Thanks

BR,
Austin Kim

>
> Takashi