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

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

enic: 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 31e0e328

drivers/net/ethernet/cisco/enic/enic_main.c

+10 −12
Original line number Diff line number Diff line
@@ -1193,18 +1193,16 @@ static int enic_get_vf_port(struct net_device *netdev, int vf, 
	if (err)

		return err;



	NLA_PUT_U16(skb, IFLA_PORT_REQUEST, pp->request);

	NLA_PUT_U16(skb, IFLA_PORT_RESPONSE, response);

	if (pp->set & ENIC_SET_NAME)

		NLA_PUT(skb, IFLA_PORT_PROFILE, PORT_PROFILE_MAX,

			pp->name);

	if (pp->set & ENIC_SET_INSTANCE)

		NLA_PUT(skb, IFLA_PORT_INSTANCE_UUID, PORT_UUID_MAX,

			pp->instance_uuid);

	if (pp->set & ENIC_SET_HOST)

		NLA_PUT(skb, IFLA_PORT_HOST_UUID, PORT_UUID_MAX,

			pp->host_uuid);



	if (nla_put_u16(skb, IFLA_PORT_REQUEST, pp->request) ||

	    nla_put_u16(skb, IFLA_PORT_RESPONSE, response) ||

	    ((pp->set & ENIC_SET_NAME) &&

	     nla_put(skb, IFLA_PORT_PROFILE, PORT_PROFILE_MAX, pp->name)) ||

	    ((pp->set & ENIC_SET_INSTANCE) &&

	     nla_put(skb, IFLA_PORT_INSTANCE_UUID, PORT_UUID_MAX,

		     pp->instance_uuid)) ||

	    ((pp->set & ENIC_SET_HOST) &&

	     nla_put(skb, IFLA_PORT_HOST_UUID, PORT_UUID_MAX, pp->host_uuid)))

		goto nla_put_failure;

	return 0;



nla_put_failure: