diff options
| author |   Sabrina Dubroca <sd@queasysnail.net> | 2016-04-22 11:28:02 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-04-24 14:31:58 -0400 |
| commit | c10c63ea739bce3b8a6ab85c7bb472d900c9b070 (patch) | |
| tree | c1f411eb17d17a7790d7883f57d160b68521892c /drivers/net/macsec.c | |
| parent | macsec: add missing NULL check after kmalloc (diff) | |
| download | linux-dev-c10c63ea739bce3b8a6ab85c7bb472d900c9b070.tar.xz linux-dev-c10c63ea739bce3b8a6ab85c7bb472d900c9b070.zip | |
macsec: take rtnl lock before for_each_netdev
Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver")
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macsec.c')
| -rw-r--r-- | drivers/net/macsec.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index f691030ee3df..5f3ea8026074 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -2268,8 +2268,6 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev, if (!hdr) return -EMSGSIZE; - rtnl_lock(); - if (nla_put_u32(skb, MACSEC_ATTR_IFINDEX, dev->ifindex)) goto nla_put_failure; @@ -2429,14 +2427,11 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev, nla_nest_end(skb, rxsc_list); - rtnl_unlock(); - genlmsg_end(skb, hdr); return 0; nla_put_failure: - rtnl_unlock(); genlmsg_cancel(skb, hdr); return -EMSGSIZE; } @@ -2450,6 +2445,7 @@ static int macsec_dump_txsc(struct sk_buff *skb, struct netlink_callback *cb) dev_idx = cb->args[0]; d = 0; + rtnl_lock(); for_each_netdev(net, dev) { struct macsec_secy *secy; @@ -2467,6 +2463,7 @@ next: } done: + rtnl_unlock(); cb->args[0] = d; return skb->len; } |