hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: i2c/other/ak4xx-adda: Fix a compile warning with CONFIG_PROCFS=n
  ALSA: prevent heap corruption in snd_ctl_new()
This commit is contained in:
Linus Torvalds 2010-10-04 11:15:59 -07:00
parent 53d22d886a e913b14649
commit d9f73afcd3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/core/control.c
View File

@ -31,6 +31,7 @@
/* max number of user-defined controls */ /* max number of user-defined controls */
#define MAX_USER_CONTROLS 32 #define MAX_USER_CONTROLS 32
#define MAX_CONTROL_COUNT 1028
struct snd_kctl_ioctl { struct snd_kctl_ioctl {
struct list_head list; /* list of all ioctls */ 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)) if (snd_BUG_ON(!control || !control->count))
return NULL; return NULL;
if (control->count > MAX_CONTROL_COUNT)
return NULL;
kctl = kzalloc(sizeof(*kctl) + sizeof(struct snd_kcontrol_volatile) * control->count, GFP_KERNEL); kctl = kzalloc(sizeof(*kctl) + sizeof(struct snd_kcontrol_volatile) * control->count, GFP_KERNEL);
if (kctl == NULL) { if (kctl == NULL) {
snd_printk(KERN_ERR "Cannot allocate control instance\n"); snd_printk(KERN_ERR "Cannot allocate control instance\n");

2
sound/i2c/other/ak4xxx-adda.c
View File

@ -900,7 +900,7 @@ static int proc_init(struct snd_akm4xxx *ak)
return 0; return 0;
} }
#else /* !CONFIG_PROC_FS */ #else /* !CONFIG_PROC_FS */
static int proc_init(struct snd_akm4xxx *ak) {} static int proc_init(struct snd_akm4xxx *ak) { return 0; }
#endif #endif
int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak) int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak)