* [PATCH] USB PCM Sound driver neglects kmalloc return value check and may deref NULL.
@ 2010-10-29 18:40 Jesper Juhl
2010-11-01 9:39 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Jesper Juhl @ 2010-10-29 18:40 UTC (permalink / raw)
To: linux-kernel; +Cc: Jaroslav Kysela, Takashi Iwai
sound/usb/pcm.c::snd_usb_pcm_check_knot() fails to check the return value
from kmalloc() and may end up dereferencing a null pointer.
The patch below (compile tested only) should take care of that little
problem.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
---
pcm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index cff3a3c..4132522 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -676,8 +676,10 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime,
if (!needs_knot)
return 0;
- subs->rate_list.count = count;
subs->rate_list.list = kmalloc(sizeof(int) * count, GFP_KERNEL);
+ if (!subs->rate_list.list)
+ return -ENOMEM;
+ subs->rate_list.count = count;
subs->rate_list.mask = 0;
count = 0;
list_for_each_entry(fp, &subs->fmt_list, list) {
--
Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
Plain text mails only, please http://www.expita.com/nomime.html
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] USB PCM Sound driver neglects kmalloc return value check and may deref NULL.
2010-10-29 18:40 [PATCH] USB PCM Sound driver neglects kmalloc return value check and may deref NULL Jesper Juhl
@ 2010-11-01 9:39 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2010-11-01 9:39 UTC (permalink / raw)
To: Jesper Juhl; +Cc: linux-kernel, Jaroslav Kysela
At Fri, 29 Oct 2010 20:40:23 +0200 (CEST),
Jesper Juhl wrote:
>
>
> sound/usb/pcm.c::snd_usb_pcm_check_knot() fails to check the return value
> from kmalloc() and may end up dereferencing a null pointer.
> The patch below (compile tested only) should take care of that little
> problem.
>
>
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Applied now. Thanks!
Takashi
> ---
> pcm.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
> index cff3a3c..4132522 100644
> --- a/sound/usb/pcm.c
> +++ b/sound/usb/pcm.c
> @@ -676,8 +676,10 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime,
> if (!needs_knot)
> return 0;
>
> - subs->rate_list.count = count;
> subs->rate_list.list = kmalloc(sizeof(int) * count, GFP_KERNEL);
> + if (!subs->rate_list.list)
> + return -ENOMEM;
> + subs->rate_list.count = count;
> subs->rate_list.mask = 0;
> count = 0;
> list_for_each_entry(fp, &subs->fmt_list, list) {
>
>
> --
> Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
> Plain text mails only, please http://www.expita.com/nomime.html
> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-01 9:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-29 18:40 [PATCH] USB PCM Sound driver neglects kmalloc return value check and may deref NULL Jesper Juhl
2010-11-01 9:39 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®