aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-04-26 18:20:36 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2018-04-30 09:07:53 +0300
commit3435dbdc1c75c2098a3d7ca987d8b4bdeb0d6632 (patch)
tree0750cb1de0a74d917a3a962d7cbae6644d089b15 /target/linux
parent7ff31bed98e7ee50e1bfca70450e0985b1cb7f1b (diff)
downloadupstream-3435dbdc1c75c2098a3d7ca987d8b4bdeb0d6632.tar.gz
upstream-3435dbdc1c75c2098a3d7ca987d8b4bdeb0d6632.tar.bz2
upstream-3435dbdc1c75c2098a3d7ca987d8b4bdeb0d6632.zip
kernel: bump 4.14 to 4.14.37
Refreshed all patches Compile-tested on: cns3xxx, imx6, octeon, ramips/mt7621, x86/64 Runtime-tested on: cns3xxx, imx6, octeon, ramips/mt7621, x86/64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Tested-by: Stijn Segers <foss@volatilesystems.org> [add extra tested targets to commit msg] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch2
-rw-r--r--target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch b/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch
index 92d7942d86..d930751d41 100644
--- a/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch
+++ b/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch
@@ -80,7 +80,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
static void nfnl_queue_net_exit_batch(struct list_head *net_exit_list)
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
-@@ -1754,8 +1754,17 @@ static int __net_init xt_net_init(struct
+@@ -1785,8 +1785,17 @@ static int __net_init xt_net_init(struct
return 0;
}
diff --git a/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch
index ec269b6cd8..3611879609 100644
--- a/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch
+++ b/target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
i += m->u.match_size) {
-@@ -1224,12 +1261,15 @@ compat_copy_entry_to_user(struct ipt_ent
+@@ -1226,12 +1263,15 @@ compat_copy_entry_to_user(struct ipt_ent
compat_uint_t origsize;
const struct xt_entry_match *ematch;
int ret = 0;