Patchwork [03/11] ipv6/mcast: join error paths using goto

login
register
mail settings
Submitter Ilpo Järvinen
Date Dec. 13, 2008, 7:17 p.m.
Message ID <12291958711225-git-send-email-ilpo.jarvinen@helsinki.fi>
Download mbox | patch
Permalink /patch/13833/
State Superseded
Delegated to: David Miller
Headers show

Comments

Ilpo Järvinen - Dec. 13, 2008, 7:17 p.m.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
---
 net/ipv6/mcast.c |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

Patch

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 0f38960..a51fb33 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -303,20 +303,23 @@  static struct inet6_dev *ip6_mc_find_dev(struct net *net,
 		dev = dev_get_by_index(net, ifindex);
 
 	if (!dev)
-		return NULL;
+		goto nodev;
 	idev = in6_dev_get(dev);
-	if (!idev) {
-		dev_put(dev);
-		return NULL;
-	}
+	if (!idev)
+		goto release;
 	read_lock_bh(&idev->lock);
-	if (idev->dead) {
-		read_unlock_bh(&idev->lock);
-		in6_dev_put(idev);
-		dev_put(dev);
-		return NULL;
-	}
+	if (idev->dead)
+		goto unlock_release;
+
 	return idev;
+
+unlock_release:
+	read_unlock_bh(&idev->lock);
+	in6_dev_put(idev);
+release:
+	dev_put(dev);
+nodev:
+	return NULL;
 }
 
 void ipv6_sock_mc_close(struct sock *sk)