nf_conntrack_proto_udp{,lite}: 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
7c80118953
commit
3c60a17b1b
2 changed files with 10 additions and 8 deletions
|
@ -181,10 +181,11 @@ udp_timeout_obj_to_nlattr(struct sk_buff *skb, const void *data)
|
||||||
{
|
{
|
||||||
const unsigned int *timeouts = data;
|
const unsigned int *timeouts = data;
|
||||||
|
|
||||||
NLA_PUT_BE32(skb, CTA_TIMEOUT_UDP_UNREPLIED,
|
if (nla_put_be32(skb, CTA_TIMEOUT_UDP_UNREPLIED,
|
||||||
htonl(timeouts[UDP_CT_UNREPLIED] / HZ));
|
htonl(timeouts[UDP_CT_UNREPLIED] / HZ)) ||
|
||||||
NLA_PUT_BE32(skb, CTA_TIMEOUT_UDP_REPLIED,
|
nla_put_be32(skb, CTA_TIMEOUT_UDP_REPLIED,
|
||||||
htonl(timeouts[UDP_CT_REPLIED] / HZ));
|
htonl(timeouts[UDP_CT_REPLIED] / HZ)))
|
||||||
|
goto nla_put_failure;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
nla_put_failure:
|
nla_put_failure:
|
||||||
|
|
|
@ -185,10 +185,11 @@ udplite_timeout_obj_to_nlattr(struct sk_buff *skb, const void *data)
|
||||||
{
|
{
|
||||||
const unsigned int *timeouts = data;
|
const unsigned int *timeouts = data;
|
||||||
|
|
||||||
NLA_PUT_BE32(skb, CTA_TIMEOUT_UDPLITE_UNREPLIED,
|
if (nla_put_be32(skb, CTA_TIMEOUT_UDPLITE_UNREPLIED,
|
||||||
htonl(timeouts[UDPLITE_CT_UNREPLIED] / HZ));
|
htonl(timeouts[UDPLITE_CT_UNREPLIED] / HZ)) ||
|
||||||
NLA_PUT_BE32(skb, CTA_TIMEOUT_UDPLITE_REPLIED,
|
nla_put_be32(skb, CTA_TIMEOUT_UDPLITE_REPLIED,
|
||||||
htonl(timeouts[UDPLITE_CT_REPLIED] / HZ));
|
htonl(timeouts[UDPLITE_CT_REPLIED] / HZ)))
|
||||||
|
goto nla_put_failure;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
nla_put_failure:
|
nla_put_failure:
|
||||||
|
|
Loading…
Reference in a new issue