[IPV4]: Fix deadlock on ip_mc_list->lock

b3347a23 · Petr Vandrovec · David S. Miller · 8575258e · b3347a23
Commit b3347a23 authored Oct 06, 2003 by Petr Vandrovec Committed by David S. Miller Oct 06, 2003
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

net/ipv4/igmp.c net/ipv4/igmp.c +3 -1

No files found.
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1391,8 +1391,9 @@ int ip_mc_del_src(struct in_device *in_dev, __u32 *pmca, int sfmode,
 	sf_markstate(pmc);
 #endif
 	if (!delta) {
+		err = -EINVAL;
 		if (!pmc->sfcount[sfmode])
-			return -EINVAL;
+			goto out_unlock;
 		pmc->sfcount[sfmode]--;
 	}
 	err = 0;
@@ -1423,6 +1424,7 @@ int ip_mc_del_src(struct in_device *in_dev, __u32 *pmca, int sfmode,
 		igmp_ifc_event(pmc->interface);
 #endif
 	}
+out_unlock:
 	spin_unlock_bh(&pmc->lock);
 	return err;
 }