.33

3 files changed, 78 insertions, 0 deletions

diff --git a/queue-2.6.33/alsa-caiaq-fix-possible-string-buffer-overflow.patch b/queue-2.6.33/alsa-caiaq-fix-possible-string-buffer-overflow.patch
new file mode 100644
index 0000000..5b9c6b5
--- /dev/null
+++ b/queue-2.6.33/alsa-caiaq-fix-possible-string-buffer-overflow.patch
@@ -0,0 +1,43 @@
+From eaae55dac6b64c0616046436b294e69fc5311581 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 14 Feb 2011 22:45:59 +0100
+Subject: ALSA: caiaq - Fix possible string-buffer overflow
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit eaae55dac6b64c0616046436b294e69fc5311581 upstream.
+
+Use strlcpy() to assure not to overflow the string array sizes by
+too long USB device name string.
+
+Reported-by: Rafa <rafa@mwrinfosecurity.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/usb/caiaq/audio.c |    2 +-
+ sound/usb/caiaq/midi.c  |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/sound/usb/caiaq/audio.c
++++ b/sound/usb/caiaq/audio.c
+@@ -639,7 +639,7 @@ int snd_usb_caiaq_audio_init(struct snd_
+ 	}
+ 
+ 	dev->pcm->private_data = dev;
+-	strcpy(dev->pcm->name, dev->product_name);
++	strlcpy(dev->pcm->name, dev->product_name, sizeof(dev->pcm->name));
+ 
+ 	memset(dev->sub_playback, 0, sizeof(dev->sub_playback));
+ 	memset(dev->sub_capture, 0, sizeof(dev->sub_capture));
+--- a/sound/usb/caiaq/midi.c
++++ b/sound/usb/caiaq/midi.c
+@@ -135,7 +135,7 @@ int snd_usb_caiaq_midi_init(struct snd_u
+ 	if (ret < 0)
+ 		return ret;
+ 
+-	strcpy(rmidi->name, device->product_name);
++	strlcpy(rmidi->name, device->product_name, sizeof(rmidi->name));
+ 
+ 	rmidi->info_flags = SNDRV_RAWMIDI_INFO_DUPLEX;
+ 	rmidi->private_data = device;
diff --git a/queue-2.6.33/alsa-hda-add-position_fix-quirk-for-an-asus-device.patch b/queue-2.6.33/alsa-hda-add-position_fix-quirk-for-an-asus-device.patch
new file mode 100644
index 0000000..3fcd1b4
--- /dev/null
+++ b/queue-2.6.33/alsa-hda-add-position_fix-quirk-for-an-asus-device.patch
@@ -0,0 +1,33 @@
+From b540afc2b3d6e4cd1d1f137ef6d9e9c78d67fecd Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson@canonical.com>
+Date: Mon, 14 Feb 2011 20:27:44 +0100
+Subject: ALSA: HDA: Add position_fix quirk for an Asus device
+
+From: David Henningsson <david.henningsson@canonical.com>
+
+commit b540afc2b3d6e4cd1d1f137ef6d9e9c78d67fecd upstream.
+
+The bug reporter claims that position_fix=1 is needed for his
+microphone to work. The controller PCI vendor-id is [1002:4383] (rev 40).
+
+Reported-by: Kjell L.
+BugLink: http://bugs.launchpad.net/bugs/718402
+Signed-off-by: David Henningsson <david.henningsson@canonical.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ sound/pci/hda/hda_intel.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2272,6 +2272,7 @@ static struct snd_pci_quirk position_fix
+ 	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
+ 	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),
+ 	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),
++	SND_PCI_QUIRK(0x1043, 0x8410, "ASUS", POS_FIX_LPIB),
+ 	SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
+ 	SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
+ 	SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba A100-259", POS_FIX_LPIB),
diff --git a/queue-2.6.33/series b/queue-2.6.33/series
index 54a483e..91c1131 100644
--- a/queue-2.6.33/series
+++ b/queue-2.6.33/series
@@ -360,3 +360,5 @@ s390-remove-task_show_regs.patch
 pm-hibernate-return-error-code-when-alloc_image_page-fails.patch
 fs-partitions-validate-map_count-in-mac-partition-tables.patch
 net-deinit-automatic-list_head.patch
+alsa-hda-add-position_fix-quirk-for-an-asus-device.patch
+alsa-caiaq-fix-possible-string-buffer-overflow.patch