diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-02-22 12:21:05 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2018-02-22 12:46:25 +0100 |
| commit | aad1f11efe1c0f761d3454ac371fd98e65284b35 (patch) | |
| tree | 96b046b404941f541c6ca5b86d94f25c0b66441b /target/linux/generic/backport-4.14/302-netfilter-nf_tables_inet-don-t-use-multihook-infrast.patch | |
| parent | 14a01311f5b834cda6962e866e855d27325d232b (diff) | |
| download | upstream-aad1f11efe1c0f761d3454ac371fd98e65284b35.tar.gz upstream-aad1f11efe1c0f761d3454ac371fd98e65284b35.tar.bz2 upstream-aad1f11efe1c0f761d3454ac371fd98e65284b35.zip | |
kernel: refresh patches
Some fuzz was introduced due to the netfilter-offload series
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/302-netfilter-nf_tables_inet-don-t-use-multihook-infrast.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/302-netfilter-nf_tables_inet-don-t-use-multihook-infrast.patch | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/302-netfilter-nf_tables_inet-don-t-use-multihook-infrast.patch b/target/linux/generic/backport-4.14/302-netfilter-nf_tables_inet-don-t-use-multihook-infrast.patch index 8649a4864a..17d8b21a0f 100644 --- a/target/linux/generic/backport-4.14/302-netfilter-nf_tables_inet-don-t-use-multihook-infrast.patch +++ b/target/linux/generic/backport-4.14/302-netfilter-nf_tables_inet-don-t-use-multihook-infrast.patch @@ -90,11 +90,12 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> - afi = &nft_af_ipv4; - else - afi = &nft_af_ipv6; -+ nft_set_pktinfo(&pkt, skb, state); - +- - ops->pf = afi->family; - if (afi->hooks[ops->hooknum]) - ops->hook = afi->hooks[ops->hooknum]; ++ nft_set_pktinfo(&pkt, skb, state); ++ + switch (state->pf) { + case NFPROTO_IPV4: + nft_set_pktinfo_ipv4(&pkt, skb); |