Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 197c4300 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: remove invert_tuple callback 



Only used by icmp(v6).  Prefer a direct call and remove this
function from the l4proto struct.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent df5e1629

include/net/netfilter/nf_conntrack_l4proto.h

+5 −6
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ struct nf_conntrack_l4proto { 
	/* protoinfo nlattr size, closes a hole */

	u16 nlattr_size;



	/* Invert the per-proto part of the tuple: ie. turn xmit into reply.

	 * Only used by icmp, most protocols use a generic version.

	 */

	bool (*invert_tuple)(struct nf_conntrack_tuple *inverse,

			     const struct nf_conntrack_tuple *orig);



	/* Returns verdict for packet, or -1 for invalid. */

	int (*packet)(struct nf_conn *ct,

		      struct sk_buff *skb,
@@ -95,6 +89,11 @@ bool icmpv6_pkt_to_tuple(const struct sk_buff *skb, 
			 struct net *net,

			 struct nf_conntrack_tuple *tuple);



bool nf_conntrack_invert_icmp_tuple(struct nf_conntrack_tuple *tuple,

				    const struct nf_conntrack_tuple *orig);

bool nf_conntrack_invert_icmpv6_tuple(struct nf_conntrack_tuple *tuple,

				      const struct nf_conntrack_tuple *orig);



int nf_conntrack_icmpv4_error(struct nf_conn *tmpl,

			      struct sk_buff *skb,

			      unsigned int dataoff,

net/netfilter/nf_conntrack_core.c

+6 −2
Original line number Diff line number Diff line
@@ -423,8 +423,12 @@ nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse, 


	inverse->dst.protonum = orig->dst.protonum;



	if (unlikely(l4proto->invert_tuple))

		return l4proto->invert_tuple(inverse, orig);

	switch (orig->dst.protonum) {

	case IPPROTO_ICMP:

		return nf_conntrack_invert_icmp_tuple(inverse, orig);

	case IPPROTO_ICMPV6:

		return nf_conntrack_invert_icmpv6_tuple(inverse, orig);

	}



	inverse->src.u.all = orig->dst.u.all;

	inverse->dst.u.all = orig->src.u.all;

net/netfilter/nf_conntrack_proto_icmp.c

+2 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static const u_int8_t invmap[] = { 
	[ICMP_ADDRESSREPLY] = ICMP_ADDRESS + 1

};



static bool icmp_invert_tuple(struct nf_conntrack_tuple *tuple,

bool nf_conntrack_invert_icmp_tuple(struct nf_conntrack_tuple *tuple,

				    const struct nf_conntrack_tuple *orig)

{

	if (orig->dst.u.icmp.type >= sizeof(invmap) ||
@@ -347,7 +347,6 @@ static struct nf_proto_net *icmp_get_net_proto(struct net *net) 
const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp =

{

	.l4proto		= IPPROTO_ICMP,

	.invert_tuple		= icmp_invert_tuple,

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.tuple_to_nlattr	= icmp_tuple_to_nlattr,

	.nlattr_tuple_size	= icmp_nlattr_tuple_size,

net/netfilter/nf_conntrack_proto_icmpv6.c

+2 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static const u_int8_t noct_valid_new[] = { 
	[ICMPV6_MLD2_REPORT - 130] = 1

};



static bool icmpv6_invert_tuple(struct nf_conntrack_tuple *tuple,

bool nf_conntrack_invert_icmpv6_tuple(struct nf_conntrack_tuple *tuple,

				      const struct nf_conntrack_tuple *orig)

{

	int type = orig->dst.u.icmp.type - 128;
@@ -358,7 +358,6 @@ static struct nf_proto_net *icmpv6_get_net_proto(struct net *net) 
const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 =

{

	.l4proto		= IPPROTO_ICMPV6,

	.invert_tuple		= icmpv6_invert_tuple,

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.tuple_to_nlattr	= icmpv6_tuple_to_nlattr,

	.nlattr_tuple_size	= icmpv6_nlattr_tuple_size,