FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-22 17:33:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

can: Stop using NLA_PUT*().

Browse Source 
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:
David S. Miller 2012-04-01 20:21:11 -04:00
parent 4e24ffa4d9
commit 31e0e32889
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/net/can/dev.c
View File

@ -687,18 +687,19 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
if (priv->do_get_state) if (priv->do_get_state)
priv->do_get_state(dev, &state); priv->do_get_state(dev, &state);
NLA_PUT_U32(skb, IFLA_CAN_STATE, state); if (nla_put_u32(skb, IFLA_CAN_STATE, state) ||
NLA_PUT(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &cm); nla_put(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &cm) ||
NLA_PUT_U32(skb, IFLA_CAN_RESTART_MS, priv->restart_ms); nla_put_u32(skb, IFLA_CAN_RESTART_MS, priv->restart_ms) ||
NLA_PUT(skb, IFLA_CAN_BITTIMING, nla_put(skb, IFLA_CAN_BITTIMING,
sizeof(priv->bittiming), &priv->bittiming); sizeof(priv->bittiming), &priv->bittiming) ||
NLA_PUT(skb, IFLA_CAN_CLOCK, sizeof(cm), &priv->clock); nla_put(skb, IFLA_CAN_CLOCK, sizeof(cm), &priv->clock) ||
if (priv->do_get_berr_counter && !priv->do_get_berr_counter(dev, &bec)) (priv->do_get_berr_counter &&
NLA_PUT(skb, IFLA_CAN_BERR_COUNTER, sizeof(bec), &bec); !priv->do_get_berr_counter(dev, &bec) &&
if (priv->bittiming_const) nla_put(skb, IFLA_CAN_BERR_COUNTER, sizeof(bec), &bec)) ||
NLA_PUT(skb, IFLA_CAN_BITTIMING_CONST, (priv->bittiming_const &&
sizeof(*priv->bittiming_const), priv->bittiming_const); nla_put(skb, IFLA_CAN_BITTIMING_CONST,
sizeof(*priv->bittiming_const), priv->bittiming_const)))
goto nla_put_failure;
return 0; return 0;
nla_put_failure: nla_put_failure:
@ -714,9 +715,9 @@ static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev)
{ {
struct can_priv *priv = netdev_priv(dev); struct can_priv *priv = netdev_priv(dev);
NLA_PUT(skb, IFLA_INFO_XSTATS, if (nla_put(skb, IFLA_INFO_XSTATS,
sizeof(priv->can_stats), &priv->can_stats); sizeof(priv->can_stats), &priv->can_stats))
goto nla_put_failure;
return 0; return 0;
nla_put_failure: nla_put_failure: