Re: [Patch] Check sound_alloc_mixerdev() failure insound/oss/nm256_audio.c

From: Eric Sesterhenn
Date: Mon Jun 05 2006 - 14:17:41 EST


hi,

> > - if (num_mixers >= MAX_MIXER_DEV) {
> > + if ((num_mixers >= MAX_MIXER_DEV) || (num_mixers < 0)) {
> ^^^^^^^^^^
> > printk ("NM256 mixer: Unable to alloc mixerdev\n");
> > return -1;
> > }
>
> But it is _still_ fails to check it.

*yuck* I hope you keep count on the numbers of beers i owe you
by now. Here is an updated patch.

Signed-off-by: Eric Sesterhenn <snakebyte@xxxxxx>

--- linux-2.6.17-rc5/sound/oss/nm256_audio.c.orig 2006-06-05 20:15:18.000000000 +0200
+++ linux-2.6.17-rc5/sound/oss/nm256_audio.c 2006-06-05 20:16:06.000000000 +0200
@@ -974,7 +974,7 @@ nm256_install_mixer (struct nm256_info *
return -1;

mixer = sound_alloc_mixerdev();
- if (num_mixers >= MAX_MIXER_DEV) {
+ if ((num_mixers >= MAX_MIXER_DEV) || (mixer < 0)) {
printk ("NM256 mixer: Unable to alloc mixerdev\n");
return -1;
}


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/