diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-05 12:21:47 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-06 11:56:18 +0200 |
| commit | 958411aa611582d9482ae6d319e1a986f195a596 (patch) | |
| tree | a9d01e8707ce38022ec5e6c349bc1b8fd75f643b /target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch | |
| parent | 2807f84b629c1a05304e4b39447973084889d9de (diff) | |
| download | upstream-958411aa611582d9482ae6d319e1a986f195a596.tar.gz upstream-958411aa611582d9482ae6d319e1a986f195a596.tar.bz2 upstream-958411aa611582d9482ae6d319e1a986f195a596.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:
- 505-arm64-dts-marvell-Fix-A37xx-UART0-register-size
Fixes:
- CVE-2019-13648
- CVE-2019-10207
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch b/target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch index b02ad8a0d7..943b3eed30 100644 --- a/target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch +++ b/target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch @@ -212,10 +212,10 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state, const struct nf_hook_entries *entries, unsigned int index, unsigned int queuenum) -@@ -144,7 +175,16 @@ static int __nf_queue(struct sk_buff *sk +@@ -148,7 +179,16 @@ static int __nf_queue(struct sk_buff *sk + }; nf_queue_entry_get_refs(entry); - skb_dst_force(skb); - afinfo->saveroute(skb, entry); + + switch (entry->state.pf) { |