From: Koen Vandeputte <koen.vandeputte@ncentric.com>
Date: Mon, 10 May 2021 12:25:40 +0000 (+0200)
Subject: kernel: bump 4.14 to 4.14.232
X-Git-Tag: v19.07.8~18
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f342de468b86be34a8be3e4a26e7089551991608;p=openwrt%2Fopenwrt.git

kernel: bump 4.14 to 4.14.232

Refreshed all patches.

Fixes:
- CVE-2021-23133

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

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
---

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index b9f53a7366..514d197361 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-4.14 = .231
+LINUX_VERSION-4.14 = .232
 
-LINUX_KERNEL_HASH-4.14.231 = 573b79adee3490a8dd82f663bb187218288c99cd2613fd9f69edf915f91e6682
+LINUX_KERNEL_HASH-4.14.232 = 1dc19361f6970bc94cc62be066702483db9cbd3d63f3089a8c90dabfced74369
 
 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/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch b/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch
index 39ef23be2a..1a4321cb96 100644
--- a/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch
+++ b/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch
@@ -140,7 +140,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  #endif
 --- a/net/netfilter/nf_conntrack_standalone.c
 +++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -309,10 +309,12 @@ static int ct_seq_show(struct seq_file *
+@@ -310,10 +310,12 @@ static int ct_seq_show(struct seq_file *
  	WARN_ON(!l4proto);
  
  	ret = -ENOSPC;
@@ -156,7 +156,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  
  	if (l4proto->print_conntrack)
  		l4proto->print_conntrack(s, ct);
-@@ -339,7 +341,9 @@ static int ct_seq_show(struct seq_file *
+@@ -340,7 +342,9 @@ static int ct_seq_show(struct seq_file *
  	if (seq_print_acct(s, ct, IP_CT_DIR_REPLY))
  		goto release;
  
diff --git a/target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch b/target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch
index 10da96b7ed..14a23a9fea 100644
--- a/target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch
+++ b/target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch
@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #include <net/net_namespace.h>
  #ifdef CONFIG_SYSCTL
  #include <linux/sysctl.h>
-@@ -381,10 +382,66 @@ static int ct_open(struct inode *inode,
+@@ -382,10 +383,66 @@ static int ct_open(struct inode *inode,
  			sizeof(struct ct_iter_state));
  }
  
@@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	.llseek  = seq_lseek,
  	.release = seq_release_net,
  };
-@@ -488,7 +545,7 @@ static int nf_conntrack_standalone_init_
+@@ -489,7 +546,7 @@ static int nf_conntrack_standalone_init_
  	kuid_t root_uid;
  	kgid_t root_gid;
  
diff --git a/target/linux/samsung/patches-4.14/002-dm9000-clk.patch b/target/linux/samsung/patches-4.14/002-dm9000-clk.patch
index cbde5edc02..0dd58fdf62 100644
--- a/target/linux/samsung/patches-4.14/002-dm9000-clk.patch
+++ b/target/linux/samsung/patches-4.14/002-dm9000-clk.patch
@@ -16,7 +16,7 @@
  
  	power = devm_regulator_get(dev, "vcc");
  	if (IS_ERR(power)) {
-@@ -1579,6 +1581,18 @@ dm9000_probe(struct platform_device *pde
+@@ -1581,6 +1583,18 @@ dm9000_probe(struct platform_device *pde
  		goto out;
  	}