diff --git a/[refs] b/[refs] index 9ddf019b2c3e..ac8d0451c15d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1a6c4da14c365d3ee0b5de43a93f7470982637c +refs/heads/master: 1e2e6b89f1d3152da0606d23e65e8760bf62a4c3 diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index fdacf9c8f1cb..9c2dbfaca60d 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -864,7 +864,6 @@ static void sock_copy(struct sock *nsk, const struct sock *osk) #endif memcpy(nsk, osk, osk->sk_prot->obj_size); - get_net(nsk->sk_net); #ifdef CONFIG_SECURITY_NETWORK nsk->sk_security = sptr; security_sk_clone(osk, nsk); @@ -958,6 +957,7 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority) sock_copy(newsk, sk); /* SANITY */ + get_net(newsk->sk_net); sk_node_init(&newsk->sk_node); sock_lock_init(newsk); bh_lock_sock(newsk);