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

Commit a400c30e authored by Holger Eitzenberger's avatar Holger Eitzenberger Committed by Patrick McHardy
Browse files

netfilter: nf_conntrack: calculate per-protocol nlattr size 



Signed-off-by: default avatarHolger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 5c0de29d

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+6 −0
Original line number Diff line number Diff line
@@ -328,6 +328,11 @@ static int ipv4_nlattr_to_tuple(struct nlattr *tb[], 


	return 0;

}



static int ipv4_nlattr_tuple_size(void)

{

	return nla_policy_len(ipv4_nla_policy, CTA_IP_MAX + 1);

}

#endif



static struct nf_sockopt_ops so_getorigdst = {
@@ -347,6 +352,7 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = { 
	.get_l4proto	 = ipv4_get_l4proto,

#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

	.tuple_to_nlattr = ipv4_tuple_to_nlattr,

	.nlattr_tuple_size = ipv4_nlattr_tuple_size,

	.nlattr_to_tuple = ipv4_nlattr_to_tuple,

	.nla_policy	 = ipv4_nla_policy,

#endif

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+6 −0
Original line number Diff line number Diff line
@@ -262,6 +262,11 @@ static int icmp_nlattr_to_tuple(struct nlattr *tb[], 


	return 0;

}



static int icmp_nlattr_tuple_size(void)

{

	return nla_policy_len(icmp_nla_policy, CTA_PROTO_MAX + 1);

}

#endif



#ifdef CONFIG_SYSCTL
@@ -309,6 +314,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly = 
	.me			= NULL,

#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

	.tuple_to_nlattr	= icmp_tuple_to_nlattr,

	.nlattr_tuple_size	= icmp_nlattr_tuple_size,

	.nlattr_to_tuple	= icmp_nlattr_to_tuple,

	.nla_policy		= icmp_nla_policy,

#endif

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+6 −0
Original line number Diff line number Diff line
@@ -342,6 +342,11 @@ static int ipv6_nlattr_to_tuple(struct nlattr *tb[], 


	return 0;

}



static int ipv6_nlattr_tuple_size(void)

{

	return nla_policy_len(ipv6_nla_policy, CTA_IP_MAX + 1);

}

#endif



struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 __read_mostly = {
@@ -353,6 +358,7 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 __read_mostly = { 
	.get_l4proto		= ipv6_get_l4proto,

#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

	.tuple_to_nlattr	= ipv6_tuple_to_nlattr,

	.nlattr_tuple_size	= ipv6_nlattr_tuple_size,

	.nlattr_to_tuple	= ipv6_nlattr_to_tuple,

	.nla_policy		= ipv6_nla_policy,

#endif

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+6 −0
Original line number Diff line number Diff line
@@ -268,6 +268,11 @@ static int icmpv6_nlattr_to_tuple(struct nlattr *tb[], 


	return 0;

}



static int icmpv6_nlattr_tuple_size(void)

{

	return nla_policy_len(icmpv6_nla_policy, CTA_PROTO_MAX + 1);

}

#endif



#ifdef CONFIG_SYSCTL
@@ -299,6 +304,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly = 
	.error			= icmpv6_error,

#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

	.tuple_to_nlattr	= icmpv6_tuple_to_nlattr,

	.nlattr_tuple_size	= icmpv6_nlattr_tuple_size,

	.nlattr_to_tuple	= icmpv6_nlattr_to_tuple,

	.nla_policy		= icmpv6_nla_policy,

#endif

net/netfilter/nf_conntrack_proto_dccp.c

+9 −0
Original line number Diff line number Diff line
@@ -669,6 +669,12 @@ static int nlattr_to_dccp(struct nlattr *cda[], struct nf_conn *ct) 
	write_unlock_bh(&dccp_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



#ifdef CONFIG_SYSCTL
@@ -749,8 +755,10 @@ static struct nf_conntrack_l4proto dccp_proto4 __read_mostly = { 
	.print_conntrack	= dccp_print_conntrack,

#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

	.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,

	.nlattr_to_tuple	= nf_ct_port_nlattr_to_tuple,

	.nla_policy		= nf_ct_port_nla_policy,

#endif
@@ -771,6 +779,7 @@ static struct nf_conntrack_l4proto dccp_proto6 __read_mostly = { 
	.to_nlattr		= dccp_to_nlattr,

	.from_nlattr		= nlattr_to_dccp,

	.tuple_to_nlattr	= nf_ct_port_tuple_to_nlattr,

	.nlattr_tuple_size	= nf_ct_port_nlattr_tuple_size,

	.nlattr_to_tuple	= nf_ct_port_nlattr_to_tuple,

	.nla_policy		= nf_ct_port_nla_policy,

#endif