aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-07-29 13:55:26 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-07-31 16:54:50 +0200
commitdf53824f462d7205225bf5a8b51e872b27903e14 (patch)
tree493657482155fae3c3b57c6bd309e736d8d6e9e2 /target/linux/generic
parent76d1e8a0c29a5cce13c765cdb794022c91a88c86 (diff)
downloadupstream-df53824f462d7205225bf5a8b51e872b27903e14.tar.gz
upstream-df53824f462d7205225bf5a8b51e872b27903e14.tar.bz2
upstream-df53824f462d7205225bf5a8b51e872b27903e14.zip
kernel: bump 4.14 to 4.14.134
Refreshed all patches. Fixes: - CVE-2019-3846 - CVE-2019-3900 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
index b60e9d3230..a61a4ec17f 100644
--- a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
+++ b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
@@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold <johan@kernel.org>
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
-@@ -1947,7 +1947,8 @@ static const struct usb_device_id option
+@@ -1948,7 +1948,8 @@ static const struct usb_device_id option
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) }, /* D-Link DWM-156 (variant) */
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },