diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-02 13:25:21 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2012-04-02 13:51:20 -0700 |
| commit | c3cc8c031bb7be42b5b818c23d0e708a0cc11a26 (patch) | |
| tree | 198ee2610276edabf4e5a8697dc26667d54b99bb /datapath/brcompat_main.c | |
| parent | d63649f1bb5101f365e51e7adbeed83a00bd6d69 (diff) | |
datapath: 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>
[jesse: Additional transformations for code not upstream.]
Signed-off-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'datapath/brcompat_main.c')
| -rw-r--r-- | datapath/brcompat_main.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/datapath/brcompat_main.c b/datapath/brcompat_main.c index 5d0f0bba..e7f741b6 100644 --- a/datapath/brcompat_main.c +++ b/datapath/brcompat_main.c @@ -63,10 +63,12 @@ static struct sk_buff *brc_make_request(int op, const char *bridge, goto error; genlmsg_put(skb, 0, 0, &brc_genl_family, 0, op); - if (bridge) - NLA_PUT_STRING(skb, BRC_GENL_A_DP_NAME, bridge); - if (port) - NLA_PUT_STRING(skb, BRC_GENL_A_PORT_NAME, port); + + if (bridge && nla_put_string(skb, BRC_GENL_A_DP_NAME, bridge)) + goto nla_put_failure; + if (port && nla_put_string(skb, BRC_GENL_A_PORT_NAME, port)) + goto nla_put_failure; + return skb; nla_put_failure: @@ -288,8 +290,9 @@ static int brc_get_fdb_entries(struct net_device *dev, void __user *userbuf, request = brc_make_request(BRC_GENL_C_FDB_QUERY, dev->name, NULL); if (!request) return -ENOMEM; - NLA_PUT_U64(request, BRC_GENL_A_FDB_COUNT, maxnum); - NLA_PUT_U64(request, BRC_GENL_A_FDB_SKIP, offset); + if (nla_put_u64(request, BRC_GENL_A_FDB_COUNT, maxnum) || + nla_put_u64(request, BRC_GENL_A_FDB_SKIP, offset)) + goto nla_put_failure; rtnl_unlock(); reply = brc_send_command(dev_net(dev), request, attrs); @@ -401,7 +404,8 @@ static int brc_genl_query(struct sk_buff *skb, struct genl_info *info) err = -ENOMEM; goto err; } - NLA_PUT_U32(ans_skb, BRC_GENL_A_MC_GROUP, brc_mc_group.id); + if (nla_put_u32(ans_skb, BRC_GENL_A_MC_GROUP, brc_mc_group.id)) + goto nla_put_failure; genlmsg_end(ans_skb, data); return genlmsg_reply(ans_skb, info); |