Skip to content

Commit

Permalink
wl12xx: Stop using NLA_PUT*().
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
David S. Miller committed Apr 2, 2012
1 parent 633c938 commit 9d83ba4
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/net/wireless/wl12xx/testmode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ static int wl1271_tm_cmd_test(struct wl1271 *wl, struct nlattr *tb[])
goto out_sleep;
}

NLA_PUT(skb, WL1271_TM_ATTR_DATA, buf_len, buf);
if (nla_put(skb, WL1271_TM_ATTR_DATA, buf_len, buf))
goto nla_put_failure;
ret = cfg80211_testmode_reply(skb);
if (ret < 0)
goto out_sleep;
Expand Down Expand Up @@ -178,7 +179,8 @@ static int wl1271_tm_cmd_interrogate(struct wl1271 *wl, struct nlattr *tb[])
goto out_free;
}

NLA_PUT(skb, WL1271_TM_ATTR_DATA, sizeof(*cmd), cmd);
if (nla_put(skb, WL1271_TM_ATTR_DATA, sizeof(*cmd), cmd))
goto nla_put_failure;
ret = cfg80211_testmode_reply(skb);
if (ret < 0)
goto out_free;
Expand Down Expand Up @@ -297,7 +299,8 @@ static int wl12xx_tm_cmd_get_mac(struct wl1271 *wl, struct nlattr *tb[])
goto out;
}

NLA_PUT(skb, WL1271_TM_ATTR_DATA, ETH_ALEN, mac_addr);
if (nla_put(skb, WL1271_TM_ATTR_DATA, ETH_ALEN, mac_addr))
goto nla_put_failure;
ret = cfg80211_testmode_reply(skb);
if (ret < 0)
goto out;
Expand Down

0 comments on commit 9d83ba4

Please sign in to comment.