---

yaml --- r: 90787 b: refs/heads/master c: 65a18ec h: refs/heads/master i: 90785: b7a258e 90783: c4d5f59 v: v3
git-mirror · Apr 16, 2008 · fe62572 · fe62572
1 parent a5c6484
commit fe62572
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d1e4468a7705db7c1415a65fd16f07113afc1b2
+refs/heads/master: 65a18ec58e5e6186103f62f720acea94dfb26f4e
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
@@ -1314,7 +1314,7 @@ void sock_net_set(struct sock *sk, struct net *net)
 static inline void sk_change_net(struct sock *sk, struct net *net)
 {
 	put_net(sock_net(sk));
-	sock_net_set(sk, net);
+	sock_net_set(sk, hold_net(net));
 }
 
 extern void sock_enable_timestamp(struct sock *sk);

diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -1001,6 +1001,7 @@ void sk_release_kernel(struct sock *sk)
 
 	sock_hold(sk);
 	sock_release(sk->sk_socket);
+	release_net(sock_net(sk));
 	sock_net_set(sk, get_net(&init_net));
 	sock_put(sk);
 }