ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-22 04:18:10 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

kernel: bump 4.14 to 4.14.74

Browse Source 
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>
This commit is contained in:
Koen Vandeputte 2018-10-04 11:28:09 +02:00
parent d837c93623
commit 149dcc26d1
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -2,11 +2,11 @@
LINUX_RELEASE?=1 LINUX_RELEASE?=1
LINUX_VERSION-4.14 = .73
LINUX_VERSION-4.9 = .131 LINUX_VERSION-4.9 = .131
LINUX_VERSION-4.14 = .74
LINUX_KERNEL_HASH-4.14.73 = 999e38141ccc447df7bf7ce10b8803c12b32274b76d3d5400bf3fd88eee0e31e
LINUX_KERNEL_HASH-4.9.131 = 57db3295469d3990af93703a97b07f1e8a14920bf3f5b68ce0330a02e7aa5d60 LINUX_KERNEL_HASH-4.9.131 = 57db3295469d3990af93703a97b07f1e8a14920bf3f5b68ce0330a02e7aa5d60
LINUX_KERNEL_HASH-4.14.74 = 70e69189fd7b2f96fa33833735c7bcf3281dc0172c3734e2c5819e9d57015c72
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

2
target/linux/generic/hack-4.14/902-debloat_proc.patch
View File

@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/fs/locks.c --- a/fs/locks.c
+++ b/fs/locks.c +++ b/fs/locks.c
@@ -2805,6 +2805,8 @@ static const struct file_operations proc @@ -2812,6 +2812,8 @@ static const struct file_operations proc
static int __init proc_locks_init(void) static int __init proc_locks_init(void)
{ {

16
target/linux/ipq806x/patches-4.14/0063-2-tsens-support-configurable-interrupts.patch
View File

@ -79,7 +79,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
return -EINVAL; return -EINVAL;
return data->ops->get_trend(data->sensor_data, trip, trend); return data->ops->get_trend(data->sensor_data, trip, trend);
@@ -286,7 +290,9 @@ static int of_thermal_set_mode(struct th @@ -289,7 +293,9 @@ static int of_thermal_set_mode(struct th
mutex_unlock(&tz->lock); mutex_unlock(&tz->lock);
data->mode = mode; data->mode = mode;
@ -90,7 +90,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
return 0; return 0;
} }
@@ -296,7 +302,8 @@ static int of_thermal_get_trip_type(stru @@ -299,7 +305,8 @@ static int of_thermal_get_trip_type(stru
{ {
struct __thermal_zone *data = tz->devdata; struct __thermal_zone *data = tz->devdata;
@ -100,7 +100,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
return -EDOM; return -EDOM;
*type = data->trips[trip].type; *type = data->trips[trip].type;
@@ -304,12 +311,39 @@ static int of_thermal_get_trip_type(stru @@ -307,12 +314,39 @@ static int of_thermal_get_trip_type(stru
return 0; return 0;
} }
@ -141,7 +141,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
return -EDOM; return -EDOM;
*temp = data->trips[trip].temperature; *temp = data->trips[trip].temperature;
@@ -322,7 +356,8 @@ static int of_thermal_set_trip_temp(stru @@ -325,7 +359,8 @@ static int of_thermal_set_trip_temp(stru
{ {
struct __thermal_zone *data = tz->devdata; struct __thermal_zone *data = tz->devdata;
@ -151,7 +151,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
return -EDOM; return -EDOM;
if (data->ops->set_trip_temp) { if (data->ops->set_trip_temp) {
@@ -344,7 +379,8 @@ static int of_thermal_get_trip_hyst(stru @@ -347,7 +382,8 @@ static int of_thermal_get_trip_hyst(stru
{ {
struct __thermal_zone *data = tz->devdata; struct __thermal_zone *data = tz->devdata;
@ -161,7 +161,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
return -EDOM; return -EDOM;
*hyst = data->trips[trip].hysteresis; *hyst = data->trips[trip].hysteresis;
@@ -357,7 +393,8 @@ static int of_thermal_set_trip_hyst(stru @@ -360,7 +396,8 @@ static int of_thermal_set_trip_hyst(stru
{ {
struct __thermal_zone *data = tz->devdata; struct __thermal_zone *data = tz->devdata;
@ -171,7 +171,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
return -EDOM; return -EDOM;
/* thermal framework should take care of data->mask & (1 << trip) */ /* thermal framework should take care of data->mask & (1 << trip) */
@@ -432,6 +469,9 @@ thermal_zone_of_add_sensor(struct device @@ -435,6 +472,9 @@ thermal_zone_of_add_sensor(struct device
if (ops->set_emul_temp) if (ops->set_emul_temp)
tzd->ops->set_emul_temp = of_thermal_set_emul_temp; tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
@ -181,7 +181,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
mutex_unlock(&tzd->lock); mutex_unlock(&tzd->lock);
return tzd; return tzd;
@@ -726,7 +766,10 @@ static const char * const trip_types[] = @@ -729,7 +769,10 @@ static const char * const trip_types[] =
[THERMAL_TRIP_ACTIVE] = "active", [THERMAL_TRIP_ACTIVE] = "active",
[THERMAL_TRIP_PASSIVE] = "passive", [THERMAL_TRIP_PASSIVE] = "passive",
[THERMAL_TRIP_HOT] = "hot", [THERMAL_TRIP_HOT] = "hot",

2
target/linux/mediatek/patches-4.14/0064-dts.patch
View File

@ -579,7 +579,7 @@
+ +
--- a/arch/arm/boot/dts/mt7623.dtsi --- a/arch/arm/boot/dts/mt7623.dtsi
+++ b/arch/arm/boot/dts/mt7623.dtsi +++ b/arch/arm/boot/dts/mt7623.dtsi
@@ -323,6 +323,7 @@ @@ -326,6 +326,7 @@
"syscon"; "syscon";
reg = <0 0x10209000 0 0x1000>; reg = <0 0x10209000 0 0x1000>;
#clock-cells = <1>; #clock-cells = <1>;

4
target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
View File

@ -64,7 +64,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#include <media/v4l2-common.h> #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. */ /* Mark the buffer as done if the EOF marker is set. */
if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) { if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n"); 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) if (npackets == 0)
return -ENOMEM; return -ENOMEM;