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

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

nf_conntrack_core: 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 cc1eb431

net/netfilter/nf_conntrack_core.c

+3 −2
Original line number Diff line number Diff line
@@ -1151,8 +1151,9 @@ static struct nf_ct_ext_type nf_ct_zone_extend __read_mostly = { 
int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,

			       const struct nf_conntrack_tuple *tuple)

{

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

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

		goto nla_put_failure;

	return 0;



nla_put_failure: