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

Commit e549a6b3 authored by David S. Miller's avatar David S. Miller
Browse files

netfilter: ipv6: Stop using NLA_PUT*(). 



These macros contain a hidden goto, and are thus extremely error
prone and make code hard to audit.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c78679e8

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+5 −4
Original line number Diff line number Diff line
@@ -278,10 +278,11 @@ static struct nf_hook_ops ipv6_conntrack_ops[] __read_mostly = { 
static int ipv6_tuple_to_nlattr(struct sk_buff *skb,

				const struct nf_conntrack_tuple *tuple)

{

	NLA_PUT(skb, CTA_IP_V6_SRC, sizeof(u_int32_t) * 4,

		&tuple->src.u3.ip6);

	NLA_PUT(skb, CTA_IP_V6_DST, sizeof(u_int32_t) * 4,

		&tuple->dst.u3.ip6);

	if (nla_put(skb, CTA_IP_V6_SRC, sizeof(u_int32_t) * 4,

		    &tuple->src.u3.ip6) ||

	    nla_put(skb, CTA_IP_V6_DST, sizeof(u_int32_t) * 4,

		    &tuple->dst.u3.ip6))

		goto nla_put_failure;

	return 0;



nla_put_failure:

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+6 −6
Original line number Diff line number Diff line
@@ -234,10 +234,10 @@ icmpv6_error(struct net *net, struct nf_conn *tmpl, 
static int icmpv6_tuple_to_nlattr(struct sk_buff *skb,

				  const struct nf_conntrack_tuple *t)

{

	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);



	if (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))

		goto nla_put_failure;

	return 0;



nla_put_failure:
@@ -300,8 +300,8 @@ icmpv6_timeout_obj_to_nlattr(struct sk_buff *skb, const void *data) 
{

	const unsigned int *timeout = data;



	NLA_PUT_BE32(skb, CTA_TIMEOUT_ICMPV6_TIMEOUT, htonl(*timeout / HZ));



	if (nla_put_be32(skb, CTA_TIMEOUT_ICMPV6_TIMEOUT, htonl(*timeout / HZ)))

		goto nla_put_failure;

	return 0;



nla_put_failure: