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

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

nf_conntrack_proto_dccp: 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 f5776941

net/netfilter/nf_conntrack_proto_dccp.c

+10 −8
Original line number Diff line number Diff line
@@ -643,11 +643,12 @@ static int dccp_to_nlattr(struct sk_buff *skb, struct nlattr *nla, 
	nest_parms = nla_nest_start(skb, CTA_PROTOINFO_DCCP | NLA_F_NESTED);

	if (!nest_parms)

		goto nla_put_failure;

	NLA_PUT_U8(skb, CTA_PROTOINFO_DCCP_STATE, ct->proto.dccp.state);

	NLA_PUT_U8(skb, CTA_PROTOINFO_DCCP_ROLE,

		   ct->proto.dccp.role[IP_CT_DIR_ORIGINAL]);

	NLA_PUT_BE64(skb, CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ,

		     cpu_to_be64(ct->proto.dccp.handshake_seq));

	if (nla_put_u8(skb, CTA_PROTOINFO_DCCP_STATE, ct->proto.dccp.state) ||

	    nla_put_u8(skb, CTA_PROTOINFO_DCCP_ROLE,

		       ct->proto.dccp.role[IP_CT_DIR_ORIGINAL]) ||

	    nla_put_be64(skb, CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ,

			 cpu_to_be64(ct->proto.dccp.handshake_seq)))

		goto nla_put_failure;

	nla_nest_end(skb, nest_parms);

	spin_unlock_bh(&ct->lock);

	return 0;
@@ -739,9 +740,10 @@ dccp_timeout_obj_to_nlattr(struct sk_buff *skb, const void *data) 
        const unsigned int *timeouts = data;

	int i;



	for (i=CTA_TIMEOUT_DCCP_UNSPEC+1; i<CTA_TIMEOUT_DCCP_MAX+1; i++)

		NLA_PUT_BE32(skb, i, htonl(timeouts[i] / HZ));



	for (i=CTA_TIMEOUT_DCCP_UNSPEC+1; i<CTA_TIMEOUT_DCCP_MAX+1; i++) {

		if (nla_put_be32(skb, i, htonl(timeouts[i] / HZ)))

			goto nla_put_failure;

	}

	return 0;



nla_put_failure: