| Submitter | Dan Carpenter |
|---|---|
| Date | Jan. 5, 2011, 7:03 a.m. |
| Message ID | <20110105070312.GA24847@bicker> |
| Download | mbox | patch |
| Permalink | /patch/77572/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
From: Dan Carpenter <error27@gmail.com> Date: Wed, 5 Jan 2011 10:03:12 +0300 > 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> Applied, thanks Dan. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c index ff3c12d..8881cb5 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, spin_lock(&dcb_lock); list_for_each_entry(itr, &dcb_app_list, list) { - if (strncmp(itr->name, netdev->name, IFNAMSIZ) == 0) - NLA_PUT(skb, DCB_ATTR_IEEE_APP, - sizeof(itr->app), &itr->app); + if (strncmp(itr->name, netdev->name, IFNAMSIZ) == 0) { + err = nla_put(skb, DCB_ATTR_IEEE_APP, sizeof(itr->app), + &itr->app); + if (err) { + spin_unlock(&dcb_lock); + goto nla_put_failure; + } + } } spin_unlock(&dcb_lock); nla_nest_end(skb, app);
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> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html