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

Commit 77236b6e authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: ctnetlink: use netlink attribute helpers 



Use NLA_PUT_BE32, nla_get_be32() etc.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 838965ba

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+4 −6
Original line number Diff line number Diff line
@@ -363,10 +363,8 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len) 
static int ipv4_tuple_to_nlattr(struct sk_buff *skb,

				const struct nf_conntrack_tuple *tuple)

{

	NLA_PUT(skb, CTA_IP_V4_SRC, sizeof(u_int32_t),

		&tuple->src.u3.ip);

	NLA_PUT(skb, CTA_IP_V4_DST, sizeof(u_int32_t),

		&tuple->dst.u3.ip);

	NLA_PUT_BE32(skb, CTA_IP_V4_SRC, tuple->src.u3.ip);

	NLA_PUT_BE32(skb, CTA_IP_V4_DST, tuple->dst.u3.ip);

	return 0;



nla_put_failure:
@@ -384,8 +382,8 @@ static int ipv4_nlattr_to_tuple(struct nlattr *tb[], 
	if (!tb[CTA_IP_V4_SRC] || !tb[CTA_IP_V4_DST])

		return -EINVAL;



	t->src.u3.ip = *(__be32 *)nla_data(tb[CTA_IP_V4_SRC]);

	t->dst.u3.ip = *(__be32 *)nla_data(tb[CTA_IP_V4_DST]);

	t->src.u3.ip = nla_get_be32(tb[CTA_IP_V4_SRC]);

	t->dst.u3.ip = nla_get_be32(tb[CTA_IP_V4_DST]);



	return 0;

}

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+6 −12
Original line number Diff line number Diff line
@@ -234,12 +234,9 @@ icmp_error(struct sk_buff *skb, unsigned int dataoff, 
static int icmp_tuple_to_nlattr(struct sk_buff *skb,

				const struct nf_conntrack_tuple *t)

{

	NLA_PUT(skb, CTA_PROTO_ICMP_ID, sizeof(u_int16_t),

		&t->src.u.icmp.id);

	NLA_PUT(skb, CTA_PROTO_ICMP_TYPE, sizeof(u_int8_t),

		&t->dst.u.icmp.type);

	NLA_PUT(skb, CTA_PROTO_ICMP_CODE, sizeof(u_int8_t),

		&t->dst.u.icmp.code);

	NLA_PUT_BE16(skb, CTA_PROTO_ICMP_ID, t->src.u.icmp.id);

	NLA_PUT_U8(skb, CTA_PROTO_ICMP_TYPE, t->dst.u.icmp.type);

	NLA_PUT_U8(skb, CTA_PROTO_ICMP_CODE, t->dst.u.icmp.code);



	return 0;
@@ -261,12 +258,9 @@ static int icmp_nlattr_to_tuple(struct nlattr *tb[], 
	    || !tb[CTA_PROTO_ICMP_ID])

		return -EINVAL;



	tuple->dst.u.icmp.type =

			*(u_int8_t *)nla_data(tb[CTA_PROTO_ICMP_TYPE]);

	tuple->dst.u.icmp.code =

			*(u_int8_t *)nla_data(tb[CTA_PROTO_ICMP_CODE]);

	tuple->src.u.icmp.id =

			*(__be16 *)nla_data(tb[CTA_PROTO_ICMP_ID]);

	tuple->dst.u.icmp.type = nla_get_u8(tb[CTA_PROTO_ICMP_TYPE]);

	tuple->dst.u.icmp.code = nla_get_u8(tb[CTA_PROTO_ICMP_CODE]);

	tuple->src.u.icmp.id = nla_get_be16(tb[CTA_PROTO_ICMP_ID]);



	if (tuple->dst.u.icmp.type >= sizeof(invmap)

	    || !invmap[tuple->dst.u.icmp.type])

net/ipv4/netfilter/nf_nat_core.c

+4 −8
Original line number Diff line number Diff line
@@ -547,10 +547,8 @@ int 
nf_nat_port_range_to_nlattr(struct sk_buff *skb,

			    const struct nf_nat_range *range)

{

	NLA_PUT(skb, CTA_PROTONAT_PORT_MIN, sizeof(__be16),

		&range->min.tcp.port);

	NLA_PUT(skb, CTA_PROTONAT_PORT_MAX, sizeof(__be16),

		&range->max.tcp.port);

	NLA_PUT_BE16(skb, CTA_PROTONAT_PORT_MIN, range->min.tcp.port);

	NLA_PUT_BE16(skb, CTA_PROTONAT_PORT_MAX, range->max.tcp.port);



	return 0;
@@ -568,8 +566,7 @@ nf_nat_port_nlattr_to_range(struct nlattr *tb[], struct nf_nat_range *range) 


	if (tb[CTA_PROTONAT_PORT_MIN]) {

		ret = 1;

		range->min.tcp.port =

			*(__be16 *)nla_data(tb[CTA_PROTONAT_PORT_MIN]);

		range->min.tcp.port = nla_get_be16(tb[CTA_PROTONAT_PORT_MIN]);

	}



	if (!tb[CTA_PROTONAT_PORT_MAX]) {
@@ -577,8 +574,7 @@ nf_nat_port_nlattr_to_range(struct nlattr *tb[], struct nf_nat_range *range) 
			range->max.tcp.port = range->min.tcp.port;

	} else {

		ret = 1;

		range->max.tcp.port =

			*(__be16 *)nla_data(tb[CTA_PROTONAT_PORT_MAX]);

		range->max.tcp.port = nla_get_be16(tb[CTA_PROTONAT_PORT_MAX]);

	}



	return ret;

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+6 −12
Original line number Diff line number Diff line
@@ -213,12 +213,9 @@ icmpv6_error(struct sk_buff *skb, unsigned int dataoff, 
static int icmpv6_tuple_to_nlattr(struct sk_buff *skb,

				  const struct nf_conntrack_tuple *t)

{

	NLA_PUT(skb, CTA_PROTO_ICMPV6_ID, sizeof(u_int16_t),

		&t->src.u.icmp.id);

	NLA_PUT(skb, CTA_PROTO_ICMPV6_TYPE, sizeof(u_int8_t),

		&t->dst.u.icmp.type);

	NLA_PUT(skb, CTA_PROTO_ICMPV6_CODE, sizeof(u_int8_t),

		&t->dst.u.icmp.code);

	NLA_PUT_BE16(skb, CTA_PROTO_ICMPV6_ID, t->src.u.icmp.id);

	NLA_PUT_U8(skb, CTA_PROTO_ICMPV6_TYPE, t->dst.u.icmp.type);

	NLA_PUT_U8(skb, CTA_PROTO_ICMPV6_CODE, t->dst.u.icmp.code);



	return 0;
@@ -240,12 +237,9 @@ static int icmpv6_nlattr_to_tuple(struct nlattr *tb[], 
	    || !tb[CTA_PROTO_ICMPV6_ID])

		return -EINVAL;



	tuple->dst.u.icmp.type =

			*(u_int8_t *)nla_data(tb[CTA_PROTO_ICMPV6_TYPE]);

	tuple->dst.u.icmp.code =

			*(u_int8_t *)nla_data(tb[CTA_PROTO_ICMPV6_CODE]);

	tuple->src.u.icmp.id =

			*(__be16 *)nla_data(tb[CTA_PROTO_ICMPV6_ID]);

	tuple->dst.u.icmp.type = nla_get_u8(tb[CTA_PROTO_ICMPV6_TYPE]);

	tuple->dst.u.icmp.code = nla_get_u8(tb[CTA_PROTO_ICMPV6_CODE]);

	tuple->src.u.icmp.id = nla_get_be16(tb[CTA_PROTO_ICMPV6_ID]);



	if (tuple->dst.u.icmp.type < 128

	    || tuple->dst.u.icmp.type - 128 >= sizeof(invmap)

net/netfilter/nf_conntrack_core.c

+4 −6
Original line number Diff line number Diff line
@@ -831,10 +831,8 @@ EXPORT_SYMBOL_GPL(__nf_ct_refresh_acct); 
int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,

			       const struct nf_conntrack_tuple *tuple)

{

	NLA_PUT(skb, CTA_PROTO_SRC_PORT, sizeof(u_int16_t),

		&tuple->src.u.tcp.port);

	NLA_PUT(skb, CTA_PROTO_DST_PORT, sizeof(u_int16_t),

		&tuple->dst.u.tcp.port);

	NLA_PUT_BE16(skb, CTA_PROTO_SRC_PORT, tuple->src.u.tcp.port);

	NLA_PUT_BE16(skb, CTA_PROTO_DST_PORT, tuple->dst.u.tcp.port);

	return 0;



nla_put_failure:
@@ -854,8 +852,8 @@ int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[], 
	if (!tb[CTA_PROTO_SRC_PORT] || !tb[CTA_PROTO_DST_PORT])

		return -EINVAL;



	t->src.u.tcp.port = *(__be16 *)nla_data(tb[CTA_PROTO_SRC_PORT]);

	t->dst.u.tcp.port = *(__be16 *)nla_data(tb[CTA_PROTO_DST_PORT]);

	t->src.u.tcp.port = nla_get_be16(tb[CTA_PROTO_SRC_PORT]);

	t->dst.u.tcp.port = nla_get_be16(tb[CTA_PROTO_DST_PORT]);



	return 0;

}