aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-09-24 11:05:57 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-09-24 12:52:05 +0200
commite39d1cf34f97667b8fc1cdb60beec7a12e70839d (patch)
treec817161b31d801558b1a2590de2378e33a93b5b7 /target/linux/generic
parentb6686576b46ee81ca4e42a73a88ee4c1cb0007b3 (diff)
downloadupstream-e39d1cf34f97667b8fc1cdb60beec7a12e70839d.tar.gz
upstream-e39d1cf34f97667b8fc1cdb60beec7a12e70839d.tar.bz2
upstream-e39d1cf34f97667b8fc1cdb60beec7a12e70839d.zip
kernel: bump 4.19 to 4.19.75
Refreshed all patches. Fixes: - CVE-2019-14814 - CVE-2019-14815 - CVE-2019-14816 - CVE-2019-14821 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/backport-4.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch2
-rw-r--r--target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch2
-rw-r--r--target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-4.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch b/target/linux/generic/backport-4.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
index fc668dca10..3a9e21f580 100644
--- a/target/linux/generic/backport-4.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
+++ b/target/linux/generic/backport-4.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
@@ -48,7 +48,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>");
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
-@@ -211,47 +211,14 @@ static struct nft_expr_type nft_flow_off
+@@ -217,47 +217,14 @@ static struct nft_expr_type nft_flow_off
.owner = THIS_MODULE,
};
diff --git a/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch b/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
index 07ef724094..64eda53295 100644
--- a/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
+++ b/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
@@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
+ nf_ct_offload_timeout(flow);
- flow->timeout = (u32)jiffies;
+ flow->timeout = (u32)jiffies + NF_FLOW_TIMEOUT;
return 0;
}
@@ -316,6 +335,8 @@ static int nf_flow_offload_gc_step(struc
diff --git a/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch
index fc0761c3c0..d147c0d743 100644
--- a/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch
+++ b/target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch
@@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
EXPORT_SYMBOL(default_qdisc_ops);
/* Main transmission queue. */
-@@ -1009,7 +1009,7 @@ static void attach_one_default_qdisc(str
+@@ -1013,7 +1013,7 @@ static void attach_one_default_qdisc(str
void *_unused)
{
struct Qdisc *qdisc;