mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 03:10:52 +07:00
decnet: 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: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
24c410dce3
commit
b21dddb9df
@ -695,13 +695,13 @@ static int dn_nl_fill_ifaddr(struct sk_buff *skb, struct dn_ifaddr *ifa,
|
||||
ifm->ifa_scope = ifa->ifa_scope;
|
||||
ifm->ifa_index = ifa->ifa_dev->dev->ifindex;
|
||||
|
||||
if (ifa->ifa_address)
|
||||
NLA_PUT_LE16(skb, IFA_ADDRESS, ifa->ifa_address);
|
||||
if (ifa->ifa_local)
|
||||
NLA_PUT_LE16(skb, IFA_LOCAL, ifa->ifa_local);
|
||||
if (ifa->ifa_label[0])
|
||||
NLA_PUT_STRING(skb, IFA_LABEL, ifa->ifa_label);
|
||||
|
||||
if ((ifa->ifa_address &&
|
||||
nla_put_le16(skb, IFA_ADDRESS, ifa->ifa_address)) ||
|
||||
(ifa->ifa_local &&
|
||||
nla_put_le16(skb, IFA_LOCAL, ifa->ifa_local)) ||
|
||||
(ifa->ifa_label[0] &&
|
||||
nla_put_string(skb, IFA_LABEL, ifa->ifa_label)))
|
||||
goto nla_put_failure;
|
||||
return nlmsg_end(skb, nlh);
|
||||
|
||||
nla_put_failure:
|
||||
|
@ -204,11 +204,11 @@ static int dn_fib_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
|
||||
frh->src_len = r->src_len;
|
||||
frh->tos = 0;
|
||||
|
||||
if (r->dst_len)
|
||||
NLA_PUT_LE16(skb, FRA_DST, r->dst);
|
||||
if (r->src_len)
|
||||
NLA_PUT_LE16(skb, FRA_SRC, r->src);
|
||||
|
||||
if ((r->dst_len &&
|
||||
nla_put_le16(skb, FRA_DST, r->dst)) ||
|
||||
(r->src_len &&
|
||||
nla_put_le16(skb, FRA_SRC, r->src)))
|
||||
goto nla_put_failure;
|
||||
return 0;
|
||||
|
||||
nla_put_failure:
|
||||
|
Loading…
Reference in New Issue
Block a user