aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-10-04 11:26:55 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-10-04 16:15:03 +0200
commita2adeffffca5304b97aaa1eb68ffc4f00138ee1e (patch)
tree9722484c7463bd60684c8aa9565e4fab388fc7a8 /target/linux/ramips
parent0bcff6b0db4bd214edc7df5df1ce5d47f424c424 (diff)
downloadupstream-a2adeffffca5304b97aaa1eb68ffc4f00138ee1e.tar.gz
upstream-a2adeffffca5304b97aaa1eb68ffc4f00138ee1e.tar.bz2
upstream-a2adeffffca5304b97aaa1eb68ffc4f00138ee1e.zip
kernel: bump 4.14 to 4.14.74
Refreshed all patches. Fixes CVE: - CVE-2018-7755 Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
index 5829b2fdd0..85a5c1310c 100644
--- a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
+++ b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
@@ -64,7 +64,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#include <media/v4l2-common.h>
-@@ -1081,9 +1086,149 @@ static void uvc_video_decode_data(struct
+@@ -1093,9 +1098,149 @@ static void uvc_video_decode_data(struct
}
}
@@ -214,7 +214,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
/* Mark the buffer as done if the EOF marker is set. */
if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");
-@@ -1498,6 +1643,8 @@ static int uvc_init_video_isoc(struct uv
+@@ -1510,6 +1655,8 @@ static int uvc_init_video_isoc(struct uv
if (npackets == 0)
return -ENOMEM;