]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: conntrack: no need to pass ctinfo to error handler
authorFlorian Westphal <fw@strlen.de>
Mon, 23 Jan 2017 17:21:53 +0000 (18:21 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 2 Feb 2017 13:31:51 +0000 (14:31 +0100)
commit9e95946fc535d9895d7ebef6931f21bf8bd3140e
tree2871b38be4c52aa87e686bd33cb27f16fa3ab16c
parenteb3ca58c86ac738c2b03eb92f84ee92074a93cc1
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>
include/net/netfilter/nf_conntrack_l4proto.h
net/ipv4/netfilter/nf_conntrack_proto_icmp.c
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_proto_dccp.c
net/netfilter/nf_conntrack_proto_sctp.c
net/netfilter/nf_conntrack_proto_tcp.c
net/netfilter/nf_conntrack_proto_udp.c