Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: sound/aoa: Add kmalloc NULL tests
ALSA: hda - Increase PCM stream name buf in patch_realtek.c
sound: mpu401.c: Buffer overflow
sound: aedsp16: Buffer overflow
ALSA: hda: fix out-of-bound hdmi_eld.sad[] write
ALSA: hda - Add quirk for Dell Studio 1555
+16
-9
+4
sound/aoa/core/gpio-pmf.c
+4
sound/aoa/core/gpio-pmf.c
···
182
182
if (!old && notify) {
183
183
irq_client = kzalloc(sizeof(struct pmf_irq_client),
184
184
GFP_KERNEL);
185
+
if (!irq_client) {
186
+
err = -ENOMEM;
187
+
goto out_unlock;
188
+
}
185
189
irq_client->data = notif;
186
190
irq_client->handler = pmf_handle_notify_irq;
187
191
irq_client->owner = THIS_MODULE;
+5
-4
sound/oss/aedsp16.c
+5
-4
sound/oss/aedsp16.c
···
325
325
/*
326
326
* Size of character arrays that store name and version of sound card
327
327
*/
328
-
#define CARDNAMELEN 15 /* Size of the card's name in chars */
329
-
#define CARDVERLEN 2 /* Size of the card's version in chars */
328
+
#define CARDNAMELEN 15 /* Size of the card's name in chars */
329
+
#define CARDVERLEN 10 /* Size of the card's version in chars */
330
+
#define CARDVERDIGITS 2 /* Number of digits in the version */
330
331
331
332
#if defined(CONFIG_SC6600)
332
333
/*
···
411
410
412
411
static int soft_cfg __initdata = 0; /* bitmapped config */
413
412
static int soft_cfg_mss __initdata = 0; /* bitmapped mss config */
414
-
static int ver[CARDVERLEN] __initdata = {0, 0}; /* DSP Ver:
413
+
static int ver[CARDVERDIGITS] __initdata = {0, 0}; /* DSP Ver:
415
414
hi->ver[0] lo->ver[1] */
416
415
417
416
#if defined(CONFIG_SC6600)
···
958
957
* string is finished.
959
958
*/
960
959
ver[len++] = ret;
961
-
} while (len < CARDVERLEN);
960
+
} while (len < CARDVERDIGITS);
962
961
sprintf(DSPVersion, "%d.%d", ver[0], ver[1]);
963
962
964
963
DBG(("success.\n"));
+1
-1
sound/oss/mpu401.c
+1
-1
sound/oss/mpu401.c
···
1074
1074
sprintf(mpu_synth_info[m].name, "%s (MPU401)", hw_config->name);
1075
1075
else
1076
1076
sprintf(mpu_synth_info[m].name,
1077
-
"MPU-401 %d.%d%c Midi interface #%d",
1077
+
"MPU-401 %d.%d%c MIDI #%d",
1078
1078
(int) (devc->version & 0xf0) >> 4,
1079
1079
devc->version & 0x0f,
1080
1080
revision_char,
+2
-2
sound/pci/hda/hda_eld.c
+2
-2
sound/pci/hda/hda_eld.c
···
508
508
char name[64];
509
509
char *sname;
510
510
long long val;
511
-
int n;
511
+
unsigned int n;
512
512
513
513
while (!snd_info_get_line(buffer, line, sizeof(line))) {
514
514
if (sscanf(line, "%s %llx", name, &val) != 2)
···
539
539
sname++;
540
540
n = 10 * n + name[4] - '0';
541
541
}
542
-
if (n < 0 || n > 31) /* double the CEA limit */
542
+
if (n >= ELD_MAX_SAD)
543
543
continue;
544
544
if (!strcmp(sname, "_coding_type"))
545
545
e->sad[n].format = val;
+2
-2
sound/pci/hda/patch_realtek.c
+2
-2
sound/pci/hda/patch_realtek.c
···
275
275
*/
276
276
unsigned int num_init_verbs;
277
277
278
-
char stream_name_analog[16]; /* analog PCM stream */
278
+
char stream_name_analog[32]; /* analog PCM stream */
279
279
struct hda_pcm_stream *stream_analog_playback;
280
280
struct hda_pcm_stream *stream_analog_capture;
281
281
struct hda_pcm_stream *stream_analog_alt_playback;
282
282
struct hda_pcm_stream *stream_analog_alt_capture;
283
283
284
-
char stream_name_digital[16]; /* digital PCM stream */
284
+
char stream_name_digital[32]; /* digital PCM stream */
285
285
struct hda_pcm_stream *stream_digital_playback;
286
286
struct hda_pcm_stream *stream_digital_capture;
287
287
+2
sound/pci/hda/patch_sigmatel.c
+2
sound/pci/hda/patch_sigmatel.c
···
1809
1809
"Dell Studio 1537", STAC_DELL_M6_DMIC),
1810
1810
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a0,
1811
1811
"Dell Studio 17", STAC_DELL_M6_DMIC),
1812
+
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02be,
1813
+
"Dell Studio 1555", STAC_DELL_M6_DMIC),
1812
1814
{} /* terminator */
1813
1815
};
1814
1816