sound fixes
Linus,
please pull sound fixes for v2.6.36-rc7 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git fix/misc
Just two small obvious fixes below.
Thanks!
Takashi
===
Dan Rosenberg (1):
ALSA: prevent heap corruption in snd_ctl_new()
Takashi Iwai (1):
ALSA: i2c/other/ak4xx-adda: Fix a compile warning with CONFIG_PROCFS=n
--- sound/core/control.c | 5 +++++ sound/i2c/other/ak4xxx-adda.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)
sound/core/control.c +5 -0
@@ -31,6 +31,7 @@/* max number of user-defined controls */ #define MAX_USER_CONTROLS 32 +#define MAX_CONTROL_COUNT 1028struct snd_kctl_ioctl {struct list_head list;/* list of all ioctls */
@@ -195,6 +196,10 @@ static struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol *control,if (snd_BUG_ON (!control || !control->count))return NULL ; + +if (control->count >MAX_CONTROL_COUNT ) +return NULL ; + kctl =kzalloc (sizeof (*kctl) +sizeof (struct snd_kcontrol_volatile ) * control->count,GFP_KERNEL );if (kctl ==NULL ) {snd_printk (KERN_ERR "Cannot allocate control instance\n" );
sound/i2c/other/ak4xxx-adda.c +1 -1
@@ -900,7 +900,7 @@ static int proc_init(struct snd_akm4xxx *ak) return 0; }#else /* !CONFIG_PROC_FS */ -static int proc_init (struct snd_akm4xxx *ak) {} +static int proc_init (struct snd_akm4xxx *ak) {return 0 ; }#endif int snd_akm4xxx_build_controls (struct snd_akm4xxx *ak)