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

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

netfilter: ipv4: 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 f3756b79

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+3 −2
Original line number Diff line number Diff line
@@ -303,8 +303,9 @@ 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_BE32(skb, CTA_IP_V4_SRC, tuple->src.u3.ip);

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

	if (nla_put_be32(skb, CTA_IP_V4_SRC, tuple->src.u3.ip) ||

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

		goto nla_put_failure;

	return 0;



nla_put_failure:

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+6 −6
Original line number Diff line number Diff line
@@ -228,10 +228,10 @@ icmp_error(struct net *net, struct nf_conn *tmpl, 
static int icmp_tuple_to_nlattr(struct sk_buff *skb,

				const struct nf_conntrack_tuple *t)

{

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



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

		goto nla_put_failure;

	return 0;



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

	const unsigned int *timeout = data;



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



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

		goto nla_put_failure;

	return 0;



nla_put_failure: