]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Mar 2016 20:54:12 +0000 (12:54 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Mar 2016 20:54:12 +0000 (12:54 -0800)
added patches:
ubi-fix-out-of-bounds-write-in-volume-update-code.patch
usb-cp210x-add-id-for-parrot-nmea-gps-flight-recorder.patch
usb-serial-option-add-support-for-quectel-uc20.patch
usb-serial-option-add-support-for-telit-le922-pid-0x1045.patch

queue-3.10/series
queue-3.10/ubi-fix-out-of-bounds-write-in-volume-update-code.patch [new file with mode: 0644]
queue-3.10/usb-cp210x-add-id-for-parrot-nmea-gps-flight-recorder.patch [new file with mode: 0644]
queue-3.10/usb-serial-option-add-support-for-quectel-uc20.patch [new file with mode: 0644]
queue-3.10/usb-serial-option-add-support-for-telit-le922-pid-0x1045.patch [new file with mode: 0644]

index f7a3ad2afa0618c37405fe5d9a09cbf50b7cf63b..d1adfa8872202fdc37507effea6effb7af15f2ca 100644 (file)
@@ -17,3 +17,7 @@ alsa-hdspm-fix-wrong-boolean-ctl-value-accesses.patch
 alsa-hdsp-fix-wrong-boolean-ctl-value-accesses.patch
 alsa-hdspm-fix-zero-division.patch
 alsa-timer-fix-broken-compat-timer-user-status-ioctl.patch
+usb-cp210x-add-id-for-parrot-nmea-gps-flight-recorder.patch
+usb-serial-option-add-support-for-telit-le922-pid-0x1045.patch
+usb-serial-option-add-support-for-quectel-uc20.patch
+ubi-fix-out-of-bounds-write-in-volume-update-code.patch
diff --git a/queue-3.10/ubi-fix-out-of-bounds-write-in-volume-update-code.patch b/queue-3.10/ubi-fix-out-of-bounds-write-in-volume-update-code.patch
new file mode 100644 (file)
index 0000000..5e550bd
--- /dev/null
@@ -0,0 +1,32 @@
+From e4f6daac20332448529b11f09388f1d55ef2084c Mon Sep 17 00:00:00 2001
+From: Richard Weinberger <richard@nod.at>
+Date: Sun, 21 Feb 2016 10:53:03 +0100
+Subject: ubi: Fix out of bounds write in volume update code
+
+From: Richard Weinberger <richard@nod.at>
+
+commit e4f6daac20332448529b11f09388f1d55ef2084c upstream.
+
+ubi_start_leb_change() allocates too few bytes.
+ubi_more_leb_change_data() will write up to req->upd_bytes +
+ubi->min_io_size bytes.
+
+Signed-off-by: Richard Weinberger <richard@nod.at>
+Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/mtd/ubi/upd.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mtd/ubi/upd.c
++++ b/drivers/mtd/ubi/upd.c
+@@ -193,7 +193,7 @@ int ubi_start_leb_change(struct ubi_devi
+       vol->changing_leb = 1;
+       vol->ch_lnum = req->lnum;
+-      vol->upd_buf = vmalloc(req->bytes);
++      vol->upd_buf = vmalloc(ALIGN((int)req->bytes, ubi->min_io_size));
+       if (!vol->upd_buf)
+               return -ENOMEM;
diff --git a/queue-3.10/usb-cp210x-add-id-for-parrot-nmea-gps-flight-recorder.patch b/queue-3.10/usb-cp210x-add-id-for-parrot-nmea-gps-flight-recorder.patch
new file mode 100644 (file)
index 0000000..f807e27
--- /dev/null
@@ -0,0 +1,34 @@
+From 3c4c615d70c8cbdc8ba8c79ed702640930652a79 Mon Sep 17 00:00:00 2001
+From: Vittorio Alfieri <vittorio88@gmail.com>
+Date: Sun, 28 Feb 2016 14:40:24 +0100
+Subject: USB: cp210x: Add ID for Parrot NMEA GPS Flight Recorder
+
+From: Vittorio Alfieri <vittorio88@gmail.com>
+
+commit 3c4c615d70c8cbdc8ba8c79ed702640930652a79 upstream.
+
+The Parrot NMEA GPS Flight Recorder is a USB composite device
+consisting of hub, flash storage, and cp210x usb to serial chip.
+It is an accessory to the mass-produced Parrot AR Drone 2.
+The device emits standard NMEA messages which make the it compatible
+with NMEA compatible software. It was tested using gpsd version 3.11-3
+as an NMEA interpreter and using the official Parrot Flight Recorder.
+
+Signed-off-by: Vittorio Alfieri <vittorio88@gmail.com>
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/cp210x.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/usb/serial/cp210x.c
++++ b/drivers/usb/serial/cp210x.c
+@@ -164,6 +164,7 @@ static const struct usb_device_id id_tab
+       { USB_DEVICE(0x18EF, 0xE025) }, /* ELV Marble Sound Board 1 */
+       { USB_DEVICE(0x1901, 0x0190) }, /* GE B850 CP2105 Recorder interface */
+       { USB_DEVICE(0x1901, 0x0193) }, /* GE B650 CP2104 PMC interface */
++      { USB_DEVICE(0x19CF, 0x3000) }, /* Parrot NMEA GPS Flight Recorder */
+       { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */
+       { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */
+       { USB_DEVICE(0x1BA4, 0x0002) }, /* Silicon Labs 358x factory default */
diff --git a/queue-3.10/usb-serial-option-add-support-for-quectel-uc20.patch b/queue-3.10/usb-serial-option-add-support-for-quectel-uc20.patch
new file mode 100644 (file)
index 0000000..c3fa8dc
--- /dev/null
@@ -0,0 +1,31 @@
+From c0992d0f54847d0d1d85c60fcaa054f175ab1ccd Mon Sep 17 00:00:00 2001
+From: Yegor Yefremov <yegorslists@googlemail.com>
+Date: Mon, 29 Feb 2016 16:39:57 +0100
+Subject: USB: serial: option: add support for Quectel UC20
+
+From: Yegor Yefremov <yegorslists@googlemail.com>
+
+commit c0992d0f54847d0d1d85c60fcaa054f175ab1ccd upstream.
+
+Add support for Quectel UC20 and blacklist the QMI interface.
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+[johan: amend commit message ]
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/option.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -1141,6 +1141,8 @@ static const struct usb_device_id option
+       { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
+       { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
+       { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */
++      { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9003), /* Quectel UC20 */
++        .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+       { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },
+       { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },
+       { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003),
diff --git a/queue-3.10/usb-serial-option-add-support-for-telit-le922-pid-0x1045.patch b/queue-3.10/usb-serial-option-add-support-for-telit-le922-pid-0x1045.patch
new file mode 100644 (file)
index 0000000..633a699
--- /dev/null
@@ -0,0 +1,38 @@
+From 5deef5551c77e488922cc4bf4bc76df63be650d0 Mon Sep 17 00:00:00 2001
+From: Daniele Palmas <dnlplm@gmail.com>
+Date: Mon, 29 Feb 2016 15:36:11 +0100
+Subject: USB: serial: option: add support for Telit LE922 PID 0x1045
+
+From: Daniele Palmas <dnlplm@gmail.com>
+
+commit 5deef5551c77e488922cc4bf4bc76df63be650d0 upstream.
+
+This patch adds support for 0x1045 PID of Telit LE922.
+
+Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/option.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -271,6 +271,7 @@ static void option_instat_callback(struc
+ #define TELIT_PRODUCT_UE910_V2                        0x1012
+ #define TELIT_PRODUCT_LE922_USBCFG0           0x1042
+ #define TELIT_PRODUCT_LE922_USBCFG3           0x1043
++#define TELIT_PRODUCT_LE922_USBCFG5           0x1045
+ #define TELIT_PRODUCT_LE920                   0x1200
+ #define TELIT_PRODUCT_LE910                   0x1201
+@@ -1191,6 +1192,8 @@ static const struct usb_device_id option
+               .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg0 },
+       { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG3),
+               .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },
++      { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG5, 0xff),
++              .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg0 },
+       { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910),
+               .driver_info = (kernel_ulong_t)&telit_le910_blacklist },
+       { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920),