netfilter: conntrack: add and use nf_l4proto_log_invalid

Browse source

We currently pass down the l4 protocol to the conntrack ->packet()
function, but the only user of this is the debug info decision.

Same information can be derived from struct nf_conn.
As a first step, add and use a new log function for this, similar to
nf_ct_helper_log().

Add __cold annotation -- invalid packets should be infrequent so
gcc can consider all call paths that lead to such a function as
unlikely.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

...

This commit is contained in:

Florian Westphal 2017-10-11 10:47:40 +02:00 • committed by Pablo Neira Ayuso

parent 2420770b3f

commit c4f3db1595

8 changed files with 82 additions and 52 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

include/net/netfilter/nf_conntrack_l4proto.h

View file

18

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

View file

14

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

View file

24

net/netfilter/nf_conntrack_proto.c

View file

3

net/netfilter/nf_conntrack_proto_dccp.c

View file

3

net/netfilter/nf_conntrack_proto_sctp.c

View file

22

net/netfilter/nf_conntrack_proto_tcp.c

View file

40

net/netfilter/nf_conntrack_proto_udp.c

View file