aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-01-04 16:03:12 -0500
committerDavid S. Miller <davem@davemloft.net>2011-01-06 14:16:54 -0500
commit70bfa2d2e1bfd90ef26758b5e2749f043a940037 (patch)
treea6dd525ad85e1fe1b95a906f8b9fa50c7f275bdb
parent0c6610017459ed9642548694fe88971d3f4206aa (diff)
dcb: unlock on error in dcbnl_ieee_get()
There is a "goto nla_put_failure" hidden inside the NLA_PUT() macro, but we're holding the dcb_lock so we need to unlock first. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/dcb/dcbnl.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c
index 9399af565715..4323bd441f0f 100644
--- a/net/dcb/dcbnl.c
+++ b/net/dcb/dcbnl.c
@@ -1264,9 +1264,14 @@ static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb,
1264 1264
1265 spin_lock(&dcb_lock); 1265 spin_lock(&dcb_lock);
1266 list_for_each_entry(itr, &dcb_app_list, list) { 1266 list_for_each_entry(itr, &dcb_app_list, list) {
1267 if (strncmp(itr->name, netdev->name, IFNAMSIZ) == 0) 1267 if (strncmp(itr->name, netdev->name, IFNAMSIZ) == 0) {
1268 NLA_PUT(skb, DCB_ATTR_IEEE_APP, 1268 err = nla_put(skb, DCB_ATTR_IEEE_APP, sizeof(itr->app),
1269 sizeof(itr->app), &itr->app); 1269 &itr->app);
1270 if (err) {
1271 spin_unlock(&dcb_lock);
1272 goto nla_put_failure;
1273 }
1274 }
1270 } 1275 }
1271 spin_unlock(&dcb_lock); 1276 spin_unlock(&dcb_lock);
1272 nla_nest_end(skb, app); 1277 nla_nest_end(skb, app);