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

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

phonet: 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 1b34ec43

net/phonet/pn_netlink.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -116,7 +116,8 @@ static int fill_addr(struct sk_buff *skb, struct net_device *dev, u8 addr, 
	ifm->ifa_flags = IFA_F_PERMANENT;

	ifm->ifa_flags = IFA_F_PERMANENT;

	ifm->ifa_scope = RT_SCOPE_LINK;

	ifm->ifa_scope = RT_SCOPE_LINK;

	ifm->ifa_index = dev->ifindex;

	ifm->ifa_index = dev->ifindex;

	NLA_PUT_U8(skb, IFA_LOCAL, addr);

	if (nla_put_u8(skb, IFA_LOCAL, addr))

		goto nla_put_failure;

	return nlmsg_end(skb, nlh);

	return nlmsg_end(skb, nlh);





nla_put_failure:

nla_put_failure:
@@ -183,8 +184,9 @@ static int fill_route(struct sk_buff *skb, struct net_device *dev, u8 dst, 
	rtm->rtm_scope = RT_SCOPE_UNIVERSE;

	rtm->rtm_scope = RT_SCOPE_UNIVERSE;

	rtm->rtm_type = RTN_UNICAST;

	rtm->rtm_type = RTN_UNICAST;

	rtm->rtm_flags = 0;

	rtm->rtm_flags = 0;

	NLA_PUT_U8(skb, RTA_DST, dst);

	if (nla_put_u8(skb, RTA_DST, dst) ||

	NLA_PUT_U32(skb, RTA_OIF, dev->ifindex);

	    nla_put_u32(skb, RTA_OIF, dev->ifindex))

		goto nla_put_failure;

	return nlmsg_end(skb, nlh);

	return nlmsg_end(skb, nlh);





nla_put_failure:

nla_put_failure: