diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-05 12:18:03 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-06 11:54:50 +0200 |
| commit | bcbc7ba768638c88f2ccb2440b22a5b2eeda6e43 (patch) | |
| tree | 3a7483d6cbea7bd69acabe03761df9709bc20c33 /target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch | |
| parent | 0f3d54f5b70c42c2b0f7802970dac123ea0f8689 (diff) | |
| download | upstream-bcbc7ba768638c88f2ccb2440b22a5b2eeda6e43.tar.gz upstream-bcbc7ba768638c88f2ccb2440b22a5b2eeda6e43.tar.bz2 upstream-bcbc7ba768638c88f2ccb2440b22a5b2eeda6e43.zip | |
kernel: bump 4.14 to 4.14.136
Refreshed all patches.
Altered patches:
- 306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch
Remove upstreamed:
- 100-powerpc-4xx-uic-clear-pending-interrupt-after-irq-ty.patch
- 088-0002-i2c-qup-fixed-releasing-dma-without-flush-operation.patch
- 500-arm64-dts-marvell-Fix-A37xx-UART0-register-size.patch
Fixes:
- CVE-2019-13648
- CVE-2019-10207
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch index 5e339865d3..aad588f19b 100644 --- a/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch +++ b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch @@ -159,7 +159,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> net->nf.proc_netfilter = proc_net_mkdir(net, "netfilter", --- a/net/netfilter/nf_queue.c +++ b/net/netfilter/nf_queue.c -@@ -202,6 +202,23 @@ repeat: +@@ -206,6 +206,23 @@ repeat: return NF_ACCEPT; } @@ -183,7 +183,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> /* Caller must hold rcu read-side lock */ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict) { -@@ -217,12 +234,12 @@ void nf_reinject(struct nf_queue_entry * +@@ -221,12 +238,12 @@ void nf_reinject(struct nf_queue_entry * net = entry->state.net; pf = entry->state.pf; |