4.4-stable patches

added patches:
	nvmem-mxs-ocotp-fix-buffer-overflow-in-read.patch
	usb-serial-cp210x-add-id-for-link-ecu.patch
	usb-serial-cp210x-add-straizona-focusers-device-ids.patch

diff --git a/queue-4.4/nvmem-mxs-ocotp-fix-buffer-overflow-in-read.patch b/queue-4.4/nvmem-mxs-ocotp-fix-buffer-overflow-in-read.patch
new file mode 100644 (file)
index 0000000..a3367e6
--- /dev/null
+++ b/queue-4.4/nvmem-mxs-ocotp-fix-buffer-overflow-in-read.patch
@@ -0,0 +1,44 @@
+From d1306eb675ad7a9a760b6b8e8e189824b8db89e7 Mon Sep 17 00:00:00 2001
+From: Stanislav Meduna <stano@meduna.org>
+Date: Mon, 2 May 2016 16:05:11 +0100
+Subject: nvmem: mxs-ocotp: fix buffer overflow in read
+
+From: Stanislav Meduna <stano@meduna.org>
+
+commit d1306eb675ad7a9a760b6b8e8e189824b8db89e7 upstream.
+
+This patch fixes the issue where the mxs_ocotp_read is reading
+the ocotp in reg_size steps but decrements the remaining size
+by 1. The number of iterations is thus four times higher,
+overwriting the area behind the output buffer.
+
+Fixes: c01e9a11ab6f ("nvmem: add driver for ocotp in i.MX23 and i.MX28")
+Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
+Signed-off-by: Stanislav Meduna <stano@meduna.org>
+Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/nvmem/mxs-ocotp.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/nvmem/mxs-ocotp.c
++++ b/drivers/nvmem/mxs-ocotp.c
+@@ -94,7 +94,7 @@ static int mxs_ocotp_read(void *context,
+       if (ret)
+               goto close_banks;
+ 
+-      while (val_size) {
++      while (val_size >= reg_size) {
+               if ((offset < OCOTP_DATA_OFFSET) || (offset % 16)) {
+                       /* fill up non-data register */
+                       *buf = 0;
+@@ -103,7 +103,7 @@ static int mxs_ocotp_read(void *context,
+               }
+ 
+               buf++;
+-              val_size--;
++              val_size -= reg_size;
+               offset += reg_size;
+       }
+ 

diff --git a/queue-4.4/series b/queue-4.4/series
index bc9f341c8ce8b0093c851f8e8e67c379d4d1c90d..057b5770c5b431f0cb39c2043235db545c330542 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -49,3 +49,6 @@ acpica-dispatcher-update-thread-id-for-recursive-method-calls.patch
 powerpc-fix-bad-inline-asm-constraint-in-create_zero_mask.patch
 libahci-save-port-map-for-forced-port-map.patch
 ata-ahci-platform-add-ports-implemented-dt-bindings.patch
+usb-serial-cp210x-add-id-for-link-ecu.patch
+usb-serial-cp210x-add-straizona-focusers-device-ids.patch
+nvmem-mxs-ocotp-fix-buffer-overflow-in-read.patch

diff --git a/queue-4.4/usb-serial-cp210x-add-id-for-link-ecu.patch b/queue-4.4/usb-serial-cp210x-add-id-for-link-ecu.patch
new file mode 100644 (file)
index 0000000..514a70a
--- /dev/null
+++ b/queue-4.4/usb-serial-cp210x-add-id-for-link-ecu.patch
@@ -0,0 +1,32 @@
+From 1d377f4d690637a0121eac8701f84a0aa1e69a69 Mon Sep 17 00:00:00 2001
+From: Mike Manning <michael@bsch.com.au>
+Date: Mon, 18 Apr 2016 12:13:23 +0000
+Subject: USB: serial: cp210x: add ID for Link ECU
+
+From: Mike Manning <michael@bsch.com.au>
+
+commit 1d377f4d690637a0121eac8701f84a0aa1e69a69 upstream.
+
+The Link ECU is an aftermarket ECU computer for vehicles that provides
+full tuning abilities as well as datalogging and displaying capabilities
+via the USB to Serial adapter built into the device.
+
+Signed-off-by: Mike Manning <michael@bsch.com.au>
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/cp210x.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/usb/serial/cp210x.c
++++ b/drivers/usb/serial/cp210x.c
+@@ -140,6 +140,8 @@ static const struct usb_device_id id_tab
+       { USB_DEVICE(0x10C4, 0xF004) }, /* Elan Digital Systems USBcount50 */
+       { USB_DEVICE(0x10C5, 0xEA61) }, /* Silicon Labs MobiData GPRS USB Modem */
+       { USB_DEVICE(0x10CE, 0xEA6A) }, /* Silicon Labs MobiData GPRS USB Modem 100EU */
++      { USB_DEVICE(0x12B8, 0xEC60) }, /* Link G4 ECU */
++      { USB_DEVICE(0x12B8, 0xEC62) }, /* Link G4+ ECU */
+       { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
+       { USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */
+       { USB_DEVICE(0x166A, 0x0201) }, /* Clipsal 5500PACA C-Bus Pascal Automation Controller */

diff --git a/queue-4.4/usb-serial-cp210x-add-straizona-focusers-device-ids.patch b/queue-4.4/usb-serial-cp210x-add-straizona-focusers-device-ids.patch
new file mode 100644 (file)
index 0000000..1c07585
--- /dev/null
+++ b/queue-4.4/usb-serial-cp210x-add-straizona-focusers-device-ids.patch
@@ -0,0 +1,37 @@
+From 613ac23a46e10d4d4339febdd534fafadd68e059 Mon Sep 17 00:00:00 2001
+From: Jasem Mutlaq <mutlaqja@ikarustech.com>
+Date: Tue, 19 Apr 2016 10:38:27 +0300
+Subject: USB: serial: cp210x: add Straizona Focusers device ids
+
+From: Jasem Mutlaq <mutlaqja@ikarustech.com>
+
+commit 613ac23a46e10d4d4339febdd534fafadd68e059 upstream.
+
+Adding VID:PID for Straizona Focusers to cp210x driver.
+
+Signed-off-by: Jasem Mutlaq <mutlaqja@ikarustech.com>
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/cp210x.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/usb/serial/cp210x.c
++++ b/drivers/usb/serial/cp210x.c
+@@ -108,6 +108,7 @@ static const struct usb_device_id id_tab
+       { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demonstration module */
+       { USB_DEVICE(0x10C4, 0x8281) }, /* Nanotec Plug & Drive */
+       { USB_DEVICE(0x10C4, 0x8293) }, /* Telegesis ETRX2USB */
++      { USB_DEVICE(0x10C4, 0x82F4) }, /* Starizona MicroTouch */
+       { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */
+       { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
+       { USB_DEVICE(0x10C4, 0x8382) }, /* Cygnal Integrated Products, Inc. */
+@@ -117,6 +118,7 @@ static const struct usb_device_id id_tab
+       { USB_DEVICE(0x10C4, 0x8418) }, /* IRZ Automation Teleport SG-10 GSM/GPRS Modem */
+       { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */
+       { USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */
++      { USB_DEVICE(0x10C4, 0x84B6) }, /* Starizona Hyperion */
+       { USB_DEVICE(0x10C4, 0x85EA) }, /* AC-Services IBUS-IF */
+       { USB_DEVICE(0x10C4, 0x85EB) }, /* AC-Services CIS-IBUS */
+       { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */