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

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

netfilter: conntrack: remove nlattr_size pointer from l4proto trackers 



similar to previous commit, but instead compute this at compile time
and turn nlattr_size into an u16.

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

include/net/netfilter/nf_conntrack_l4proto.h

+3 −4
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ struct nf_conntrack_l4proto { 
	/* Resolve clashes on insertion races. */

	bool allow_clash;



	/* protoinfo nlattr size, closes a hole */

	u16 nlattr_size;



	/* Try to fill in the third arg: dataoff is offset past network protocol

           hdr.  Return true if possible. */

	bool (*pkt_to_tuple)(const struct sk_buff *skb, unsigned int dataoff,
@@ -66,8 +69,6 @@ struct nf_conntrack_l4proto { 
	/* convert protoinfo to nfnetink attributes */

	int (*to_nlattr)(struct sk_buff *skb, struct nlattr *nla,

			 struct nf_conn *ct);

	/* Calculate protoinfo nlattr size */

	int (*nlattr_size)(void);



	/* convert nfnetlink attributes to protoinfo */

	int (*from_nlattr)(struct nlattr *tb[], struct nf_conn *ct);
@@ -80,8 +81,6 @@ struct nf_conntrack_l4proto { 
			       struct nf_conntrack_tuple *t);

	const struct nla_policy *nla_policy;



	size_t nla_size;



#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

	struct {

		int (*nlattr_to_obj)(struct nlattr *tb[],

net/netfilter/nf_conntrack_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static size_t ctnetlink_proto_size(const struct nf_conn *ct) 
	len *= 3u; /* ORIG, REPLY, MASTER */



	l4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct));

	len += l4proto->nla_size;

	len += l4proto->nlattr_size;

	if (l4proto->nlattr_tuple_size) {

		len4 = l4proto->nlattr_tuple_size();

		len4 *= 3u; /* ORIG, REPLY, MASTER */

net/netfilter/nf_conntrack_proto.c

+1 −5
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ int nf_ct_l4proto_register_one(struct nf_conntrack_l4proto *l4proto) 
	if (l4proto->l3proto >= ARRAY_SIZE(nf_ct_protos))

		return -EBUSY;



	if ((l4proto->to_nlattr && !l4proto->nlattr_size) ||

	if ((l4proto->to_nlattr && l4proto->nlattr_size == 0) ||

	    (l4proto->tuple_to_nlattr && !l4proto->nlattr_tuple_size))

		return -EINVAL;
@@ -428,10 +428,6 @@ int nf_ct_l4proto_register_one(struct nf_conntrack_l4proto *l4proto) 
		goto out_unlock;

	}



	l4proto->nla_size = 0;

	if (l4proto->nlattr_size)

		l4proto->nla_size += l4proto->nlattr_size();



	rcu_assign_pointer(nf_ct_protos[l4proto->l3proto][l4proto->l4proto],

			   l4proto);

out_unlock:

net/netfilter/nf_conntrack_proto_dccp.c

+8 −9
Original line number Diff line number Diff line
@@ -654,6 +654,12 @@ static const struct nla_policy dccp_nla_policy[CTA_PROTOINFO_DCCP_MAX + 1] = { 
	[CTA_PROTOINFO_DCCP_PAD]	= { .type = NLA_UNSPEC },

};



#define DCCP_NLATTR_SIZE ( \

	NLA_ALIGN(NLA_HDRLEN + 1) + \

	NLA_ALIGN(NLA_HDRLEN + 1) + \

	NLA_ALIGN(NLA_HDRLEN + sizeof(u64)) + \

	NLA_ALIGN(NLA_HDRLEN + 0))



static int nlattr_to_dccp(struct nlattr *cda[], struct nf_conn *ct)

{

	struct nlattr *attr = cda[CTA_PROTOINFO_DCCP];
@@ -691,13 +697,6 @@ static int nlattr_to_dccp(struct nlattr *cda[], struct nf_conn *ct) 
	spin_unlock_bh(&ct->lock);

	return 0;

}



static int dccp_nlattr_size(void)

{

	return nla_total_size(0)	/* CTA_PROTOINFO_DCCP */

		+ nla_policy_len(dccp_nla_policy, CTA_PROTOINFO_DCCP_MAX + 1);

}



#endif



#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
@@ -876,8 +875,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4 __read_mostly = { 
	.print_conntrack	= dccp_print_conntrack,

#endif

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.nlattr_size		= DCCP_NLATTR_SIZE,

	.to_nlattr		= dccp_to_nlattr,

	.nlattr_size		= dccp_nlattr_size,

	.from_nlattr		= nlattr_to_dccp,

	.tuple_to_nlattr	= nf_ct_port_tuple_to_nlattr,

	.nlattr_tuple_size	= nf_ct_port_nlattr_tuple_size,
@@ -912,8 +911,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6 __read_mostly = { 
	.print_conntrack	= dccp_print_conntrack,

#endif

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.nlattr_size		= DCCP_NLATTR_SIZE,

	.to_nlattr		= dccp_to_nlattr,

	.nlattr_size		= dccp_nlattr_size,

	.from_nlattr		= nlattr_to_dccp,

	.tuple_to_nlattr	= nf_ct_port_tuple_to_nlattr,

	.nlattr_tuple_size	= nf_ct_port_nlattr_tuple_size,

net/netfilter/nf_conntrack_proto_sctp.c

+7 −8
Original line number Diff line number Diff line
@@ -578,6 +578,11 @@ static const struct nla_policy sctp_nla_policy[CTA_PROTOINFO_SCTP_MAX+1] = { 
	[CTA_PROTOINFO_SCTP_VTAG_REPLY]     = { .type = NLA_U32 },

};



#define SCTP_NLATTR_SIZE ( \

		NLA_ALIGN(NLA_HDRLEN + 1) + \

		NLA_ALIGN(NLA_HDRLEN + 4) + \

		NLA_ALIGN(NLA_HDRLEN + 4))



static int nlattr_to_sctp(struct nlattr *cda[], struct nf_conn *ct)

{

	struct nlattr *attr = cda[CTA_PROTOINFO_SCTP];
@@ -608,12 +613,6 @@ static int nlattr_to_sctp(struct nlattr *cda[], struct nf_conn *ct) 


	return 0;

}



static int sctp_nlattr_size(void)

{

	return nla_total_size(0)	/* CTA_PROTOINFO_SCTP */

		+ nla_policy_len(sctp_nla_policy, CTA_PROTOINFO_SCTP_MAX + 1);

}

#endif



#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
@@ -793,8 +792,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp4 __read_mostly = { 
	.can_early_drop		= sctp_can_early_drop,

	.me 			= THIS_MODULE,

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.nlattr_size		= SCTP_NLATTR_SIZE,

	.to_nlattr		= sctp_to_nlattr,

	.nlattr_size		= sctp_nlattr_size,

	.from_nlattr		= nlattr_to_sctp,

	.tuple_to_nlattr	= nf_ct_port_tuple_to_nlattr,

	.nlattr_tuple_size	= nf_ct_port_nlattr_tuple_size,
@@ -830,8 +829,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6 __read_mostly = { 
	.can_early_drop		= sctp_can_early_drop,

	.me 			= THIS_MODULE,

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.nlattr_size		= SCTP_NLATTR_SIZE,

	.to_nlattr		= sctp_to_nlattr,

	.nlattr_size		= sctp_nlattr_size,

	.from_nlattr		= nlattr_to_sctp,

	.tuple_to_nlattr	= nf_ct_port_tuple_to_nlattr,

	.nlattr_tuple_size	= nf_ct_port_nlattr_tuple_size,