From: Dan Carpenter <error27@gmail.com>
Date: Wed, 15 Jun 2011 03:11:42 +0000 (+0000)
Subject: rtnetlink: unlock on error path in netlink_dump()
X-Git-Tag: MMI-PSA29.97-13-9~18929^2~431
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c63d6ea3060d9e10773e869b1112e3a0efbcf820;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

rtnetlink: unlock on error path in netlink_dump()

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>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
---

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 0b92f75491b1..ca5276c51804 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;
 }