Re: [LEDE-DEV] [PATCH] kernel: bump 4.14 to 4.14.36

2018-04-24 Thread Stijn Segers 

Compile-tested on: ramips/mt7621, x86/64.
Run-tested on: ramips/mt7621, x86/64.

Op di, 24 apr 2018 om 4:59 , schreef Koen Vandeputte 
:

Refreshed all patches.

Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6

Fixes for CVEs:
CVE-2018-1108
CVE-2018-1092
CVE-2018-1094
CVE-2018-1095

Signed-off-by: Koen Vandeputte 

Tested-by: Stijn Segers 


---


Note:
Requires the patch from Kevin D-B (kernel: bump 4.9 to 4.9.96) first 
to avoid conflicts in kernel-version.h




 include/kernel-version.mk  |  4 
++--
 target/linux/cns3xxx/patches-4.14/075-spi_support.patch|  2 
+-
 ...-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch |  4 
++--
 .../400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch|  2 
+-
 .../patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch |  2 
+-
 target/linux/mediatek/patches-4.14/0064-dts.patch  | 10 
+-

 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 9191bddc7d00..8d0a62347cbf 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -5,12 +5,12 @@ LINUX_RELEASE?=1
 LINUX_VERSION-3.18 = .71
 LINUX_VERSION-4.4 = .121
 LINUX_VERSION-4.9 = .96
-LINUX_VERSION-4.14 = .34
+LINUX_VERSION-4.14 = .36

 LINUX_KERNEL_HASH-3.18.71 = 
5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
 LINUX_KERNEL_HASH-4.4.121 = 
44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
 LINUX_KERNEL_HASH-4.9.96 = 
826f596eb5197f8b17304649c2990dd7b766f5c79076cae79f4261c40cea877f
-LINUX_KERNEL_HASH-4.14.34 = 
782b6c4c85275c382c820e1934d3e6003ef468f43cfc5e7c22bc07c331a12bb9
+LINUX_KERNEL_HASH-4.14.36 = 
cae24404d7b5812a331cbbc430b3ab75ca0f76eb16803528cbffbc42e768bc43


 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst 
https://,,$(1
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst 
.,_,$(subst -,_,$(subst /,_,$(1)))
diff --git a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch 
b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch

index 8a51eb396b47..e38dbdb75e10 100644
--- a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch
+++ b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch
@@ -39,7 +39,7 @@
  /**
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -1021,6 +1021,9 @@ static int spi_transfer_one_message(stru
+@@ -1027,6 +1027,9 @@ static int spi_transfer_one_message(stru
list_for_each_entry(xfer, >transfers, transfer_list) {
trace_spi_transfer_start(msg, xfer);

diff --git 
a/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch 
b/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch

index 180d1407d24f..2a09caf44254 100644
--- 
a/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ 
b/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch

@@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle 

 --- a/drivers/mtd/ubi/build.c
 +++ b/drivers/mtd/ubi/build.c
-@@ -1157,6 +1157,49 @@ static struct mtd_info * __init open_mtd
+@@ -1168,6 +1168,49 @@ static struct mtd_info * __init open_mtd
return mtd;
  }

@@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle 
  static int __init ubi_init(void)
  {
int err, i, k;
-@@ -1240,6 +1283,12 @@ static int __init ubi_init(void)
+@@ -1251,6 +1294,12 @@ static int __init ubi_init(void)
}
}

diff --git 
a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch 
b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch

index 86cb454619da..8a9da2c08813 100644
--- 
a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch
+++ 
b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch
@@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter 



 --- a/drivers/mtd/ubi/build.c
 +++ b/drivers/mtd/ubi/build.c
-@@ -1170,6 +1170,9 @@ static void __init ubi_auto_attach(void)
+@@ -1181,6 +1181,9 @@ static void __init ubi_auto_attach(void)
mtd = open_mtd_device("ubi");
if (IS_ERR(mtd))
mtd = open_mtd_device("data");
diff --git 
a/target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch 
b/target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch

index a0fdc14f782c..a443adfe6486 100644
--- 
a/target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch
+++ 
b/target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch

@@ -16,7 +16,7 @@ Acked-by: Philipp Zabel 

 ---

[LEDE-DEV] [PATCH] kernel: bump 4.14 to 4.14.36

2018-04-24 Thread Koen Vandeputte 
Refreshed all patches.

Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6

Fixes for CVEs:
CVE-2018-1108
CVE-2018-1092
CVE-2018-1094
CVE-2018-1095

Signed-off-by: Koen Vandeputte 
---


Note:
Requires the patch from Kevin D-B (kernel: bump 4.9 to 4.9.96) first to avoid 
conflicts in kernel-version.h



 include/kernel-version.mk  |  4 ++--
 target/linux/cns3xxx/patches-4.14/075-spi_support.patch|  2 +-
 ...-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch |  4 ++--
 .../400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch|  2 +-
 .../patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch |  2 +-
 target/linux/mediatek/patches-4.14/0064-dts.patch  | 10 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 9191bddc7d00..8d0a62347cbf 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -5,12 +5,12 @@ LINUX_RELEASE?=1
 LINUX_VERSION-3.18 = .71
 LINUX_VERSION-4.4 = .121
 LINUX_VERSION-4.9 = .96
-LINUX_VERSION-4.14 = .34
+LINUX_VERSION-4.14 = .36
 
 LINUX_KERNEL_HASH-3.18.71 = 
5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
 LINUX_KERNEL_HASH-4.4.121 = 
44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
 LINUX_KERNEL_HASH-4.9.96 = 
826f596eb5197f8b17304649c2990dd7b766f5c79076cae79f4261c40cea877f
-LINUX_KERNEL_HASH-4.14.34 = 
782b6c4c85275c382c820e1934d3e6003ef468f43cfc5e7c22bc07c331a12bb9
+LINUX_KERNEL_HASH-4.14.36 = 
cae24404d7b5812a331cbbc430b3ab75ca0f76eb16803528cbffbc42e768bc43
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst 
-,_,$(subst /,_,$(1)))
diff --git a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch 
b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch
index 8a51eb396b47..e38dbdb75e10 100644
--- a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch
+++ b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch
@@ -39,7 +39,7 @@
  /**
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -1021,6 +1021,9 @@ static int spi_transfer_one_message(stru
+@@ -1027,6 +1027,9 @@ static int spi_transfer_one_message(stru
list_for_each_entry(xfer, >transfers, transfer_list) {
trace_spi_transfer_start(msg, xfer);
  
diff --git 
a/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
 
b/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index 180d1407d24f..2a09caf44254 100644
--- 
a/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ 
b/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle 
 
 --- a/drivers/mtd/ubi/build.c
 +++ b/drivers/mtd/ubi/build.c
-@@ -1157,6 +1157,49 @@ static struct mtd_info * __init open_mtd
+@@ -1168,6 +1168,49 @@ static struct mtd_info * __init open_mtd
return mtd;
  }
  
@@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle 
  static int __init ubi_init(void)
  {
int err, i, k;
-@@ -1240,6 +1283,12 @@ static int __init ubi_init(void)
+@@ -1251,6 +1294,12 @@ static int __init ubi_init(void)
}
}
  
diff --git 
a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch
 
b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch
index 86cb454619da..8a9da2c08813 100644
--- 
a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch
+++ 
b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch
@@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter 
 
 --- a/drivers/mtd/ubi/build.c
 +++ b/drivers/mtd/ubi/build.c
-@@ -1170,6 +1170,9 @@ static void __init ubi_auto_attach(void)
+@@ -1181,6 +1181,9 @@ static void __init ubi_auto_attach(void)
mtd = open_mtd_device("ubi");
if (IS_ERR(mtd))
mtd = open_mtd_device("data");
diff --git 
a/target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch
 
b/target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch
index a0fdc14f782c..a443adfe6486 100644
--- 
a/target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch
+++ 
b/target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch
@@ -16,7 +16,7 @@ Acked-by: Philipp Zabel 
 
 --- a/drivers/clk/mediatek/clk-mt2701.c
 +++ b/drivers/clk/mediatek/clk-mt2701.c
-@@ -771,6 +771,8 @@ static void mtk_infrasys_init_early(stru
+@@ -772,6 +772,8 @@ static void mtk_infrasys_init_early(stru
if (r)