---

yaml --- r: 341886 b: refs/heads/master c: 0e1efe9 h: refs/heads/master v: v3
git-mirror · Dec 5, 2012 · 16c096c · 16c096c
1 parent 5f5ded1
commit 16c096c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc86802805b5d714a5dc80fe4edecaf1368b09ed
+refs/heads/master: 0e1efe9d5e10921f1e2152b108e013605fca3c9f
diff --git a/trunk/net/ipv6/anycast.c b/trunk/net/ipv6/anycast.c
@@ -189,6 +189,9 @@ void ipv6_sock_ac_close(struct sock *sk)
 	struct net *net = sock_net(sk);
 	int	prev_index;
 
+	if (!np->ipv6_ac_list)
+		return;
+
 	write_lock_bh(&ipv6_sk_ac_lock);
 	pac = np->ipv6_ac_list;
 	np->ipv6_ac_list = NULL;

diff --git a/trunk/net/ipv6/mcast.c b/trunk/net/ipv6/mcast.c
@@ -284,6 +284,9 @@ void ipv6_sock_mc_close(struct sock *sk)
 	struct ipv6_mc_socklist *mc_lst;
 	struct net *net = sock_net(sk);
 
+	if (!rcu_access_pointer(np->ipv6_mc_list))
+		return;
+
 	spin_lock(&ipv6_sk_mc_lock);
 	while ((mc_lst = rcu_dereference_protected(np->ipv6_mc_list,
 				lockdep_is_held(&ipv6_sk_mc_lock))) != NULL) {