3.4-stable patches

added patches:
	iscsi-target-fix-tfc_tpg_nacl_auth_cit-configfs-length-overflow.patch
	usb-storage-add-microvault-flash-drive-to-unusual_devs.patch

diff --git a/queue-3.4/iscsi-target-fix-tfc_tpg_nacl_auth_cit-configfs-length-overflow.patch b/queue-3.4/iscsi-target-fix-tfc_tpg_nacl_auth_cit-configfs-length-overflow.patch
new file mode 100644 (file)
index 0000000..fb04644
--- /dev/null
+++ b/queue-3.4/iscsi-target-fix-tfc_tpg_nacl_auth_cit-configfs-length-overflow.patch
@@ -0,0 +1,32 @@
+From 0fbfc46fb0b2f543a8b539e94c6c293ebc0b05a6 Mon Sep 17 00:00:00 2001
+From: Joern Engel <joern@logfs.org>
+Date: Wed, 3 Jul 2013 11:35:11 -0400
+Subject: iscsi-target: Fix tfc_tpg_nacl_auth_cit configfs length overflow
+
+From: Joern Engel <joern@logfs.org>
+
+commit 0fbfc46fb0b2f543a8b539e94c6c293ebc0b05a6 upstream.
+
+This patch fixes a potential buffer overflow while processing
+iscsi_node_auth input for configfs attributes within NodeACL
+tfc_tpg_nacl_auth_cit context.
+
+Signed-off-by: Joern Engel <joern@logfs.org>
+Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/target/iscsi/iscsi_target_configfs.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/target/iscsi/iscsi_target_configfs.c
++++ b/drivers/target/iscsi/iscsi_target_configfs.c
+@@ -415,7 +415,7 @@ static ssize_t __iscsi_##prefix##_store_
+       if (!capable(CAP_SYS_ADMIN))                                    \
+               return -EPERM;                                          \
+                                                                       \
+-      snprintf(auth->name, PAGE_SIZE, "%s", page);                    \
++      snprintf(auth->name, sizeof(auth->name), "%s", page);           \
+       if (!strncmp("NULL", auth->name, 4))                            \
+               auth->naf_flags &= ~flags;                              \
+       else                                                            \

diff --git a/queue-3.4/series b/queue-3.4/series
new file mode 100644 (file)
index 0000000..2e14cfa
--- /dev/null
+++ b/queue-3.4/series
@@ -0,0 +1,2 @@
+iscsi-target-fix-tfc_tpg_nacl_auth_cit-configfs-length-overflow.patch
+usb-storage-add-microvault-flash-drive-to-unusual_devs.patch

diff --git a/queue-3.4/usb-storage-add-microvault-flash-drive-to-unusual_devs.patch b/queue-3.4/usb-storage-add-microvault-flash-drive-to-unusual_devs.patch
new file mode 100644 (file)
index 0000000..7e6f306
--- /dev/null
+++ b/queue-3.4/usb-storage-add-microvault-flash-drive-to-unusual_devs.patch
@@ -0,0 +1,37 @@
+From e7a6121f4929c17215f0cdca3726f4bf3e4e9529 Mon Sep 17 00:00:00 2001
+From: Ren Bigcren <bigcren.ren@sonymobile.com>
+Date: Tue, 2 Jul 2013 13:34:30 +0200
+Subject: USB: storage: Add MicroVault Flash Drive to unusual_devs
+
+From: Ren Bigcren <bigcren.ren@sonymobile.com>
+
+commit e7a6121f4929c17215f0cdca3726f4bf3e4e9529 upstream.
+
+The device report an error capacity when read_capacity_16().
+Using read_capacity_10() can get the correct capacity.
+
+Signed-off-by: Ren Bigcren <bigcren.ren@sonymobile.com>
+Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
+Signed-off-by: Oskar Andero <oskar.andero@sonymobile.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/storage/unusual_devs.h |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -657,6 +657,13 @@ UNUSUAL_DEV(  0x054c, 0x016a, 0x0000, 0x
+               USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+               US_FL_FIX_INQUIRY ),
+ 
++/* Submitted by Ren Bigcren <bigcren.ren@sonymobile.com> */
++UNUSUAL_DEV(  0x054c, 0x02a5, 0x0100, 0x0100,
++              "Sony Corp.",
++              "MicroVault Flash Drive",
++              USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++              US_FL_NO_READ_CAPACITY_16 ),
++
+ /* floppy reports multiple luns */
+ UNUSUAL_DEV(  0x055d, 0x2020, 0x0000, 0x0210,
+               "SAMSUNG",