diff options
author | Florian Westphal <fw@strlen.de> | 2017-01-23 18:21:53 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-02-02 14:31:51 +0100 |
commit | 11df4b760f11ca7528c62b1c4b870735d1c62116 (patch) | |
tree | 2871b38be4c52aa87e686bd33cb27f16fa3ab16c /net/netfilter/nf_conntrack_proto_tcp.c | |
parent | 10435c1192d06bdb0bac7666452d8219d7e7c477 (diff) | |
download | linux-stable-11df4b760f11ca7528c62b1c4b870735d1c62116.tar.gz linux-stable-11df4b760f11ca7528c62b1c4b870735d1c62116.tar.bz2 linux-stable-11df4b760f11ca7528c62b1c4b870735d1c62116.zip |
netfilter: conntrack: no need to pass ctinfo to error handler
It is never accessed for reading and the only places that write to it
are the icmp(6) handlers, which also set skb->nfct (and skb->nfctinfo).
The conntrack core specifically checks for attached skb->nfct after
->error() invocation and returns early in this case.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_proto_tcp.c')
-rw-r--r-- | net/netfilter/nf_conntrack_proto_tcp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 69f687740c76..b122e9dacfed 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -750,7 +750,6 @@ static const u8 tcp_valid_flags[(TCPHDR_FIN|TCPHDR_SYN|TCPHDR_RST|TCPHDR_ACK| static int tcp_error(struct net *net, struct nf_conn *tmpl, struct sk_buff *skb, unsigned int dataoff, - enum ip_conntrack_info *ctinfo, u_int8_t pf, unsigned int hooknum) { |