Message ID | 20110615131142.GE23739@shale.localdomain |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Dan Carpenter <error27@gmail.com> Date: Wed, 15 Jun 2011 16:11:42 +0300 > In c7ac8679bec939 "rtnetlink: Compute and store minimum ifinfo dump > size", we moved the allocation under the lock so we need to unlock > on error path. > > Signed-off-by: Dan Carpenter <error27@gmail.com> Applied, thanks. -- 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
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 0b92f7549..ca5276c 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1676,7 +1676,7 @@ static int netlink_dump(struct sock *sk) skb = sock_rmalloc(sk, alloc_size, 0, GFP_KERNEL); if (!skb) - goto errout; + goto errout_skb; len = cb->dump(skb, cb); @@ -1716,7 +1716,6 @@ static int netlink_dump(struct sock *sk) errout_skb: mutex_unlock(nlk->cb_mutex); kfree_skb(skb); -errout: return err; }
In c7ac8679bec939 "rtnetlink: Compute and store minimum ifinfo dump size", we moved the allocation under the lock so we need to unlock on error path. 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