Home » Mailing list archives » linux-netdev » 2007 » October » 31

[PATCH 2/8] Move the get_net() from sock_copy()

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Pavel Emelyanov <xemul@...>
To: David Miller <davem@...>
Cc: Linux Netdev List <netdev@...>, <devel@...>
Subject: [PATCH 2/8] Move the get_net() from sock_copy()
Date: Wednesday, October 31, 2007 - 9:44 am

The sock_copy() is supposed to just clone the socket. In a perfect
world it has to be just memcpy, but we have to handle the security
mark correctly. All the extra setup must be performed in sk_clone() 
call, so move the get_net() into more proper place.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

---

diff --git a/net/core/sock.c b/net/core/sock.c
index fdacf9c..9c2dbfa 100644
--- a/net/core/sock.c
+++ b/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);
-- 
1.5.3.4

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/8] Cleanup/fix the sk_alloc() call, Pavel Emelyanov, (Wed Oct 31, 9:40 am)
Re: [PATCH 0/8] Cleanup/fix the sk_alloc() call, Arnaldo Carvalho de Melo, (Wed Oct 31, 9:15 am)
Re: [PATCH 0/8] Cleanup/fix the sk_alloc() call, Pavel Emelyanov, (Wed Oct 31, 10:32 am)
Re: [PATCH 0/8] Cleanup/fix the sk_alloc() call, Arnaldo Carvalho de Melo, (Wed Oct 31, 10:14 am)
[PATCH 8/8] Forget the zero_it argument of sk_alloc(), Pavel Emelyanov, (Wed Oct 31, 9:59 am)
Re: [PATCH 8/8] Forget the zero_it argument of sk_alloc(), David Miller, (Thu Nov 1, 3:41 am)
[PATCH 7/8] Remove bogus zero_it argument from sk_alloc, Pavel Emelyanov, (Wed Oct 31, 9:56 am)
Re: [PATCH 7/8] Remove bogus zero_it argument from sk_alloc, David Miller, (Thu Nov 1, 3:38 am)
[PATCH 6/8] Make the sk_clone() lighter, Pavel Emelyanov, (Wed Oct 31, 9:54 am)
Re: [PATCH 6/8] Make the sk_clone() lighter, David Miller, (Thu Nov 1, 3:38 am)
Re: [PATCH 6/8] Make the sk_clone() lighter, David Miller, (Thu Nov 1, 3:26 am)
Re: [PATCH 6/8] Make the sk_clone() lighter, Pavel Emelyanov, (Thu Nov 1, 4:46 am)
[PATCH 5/8] Move some core sock setup into sk_prot_alloc, Pavel Emelyanov, (Wed Oct 31, 9:51 am)
Re: [PATCH 5/8] Move some core sock setup into sk_prot_alloc, David Miller, (Thu Nov 1, 3:36 am)
[PATCH 4/8] Auto-zero the allocated sock object, Pavel Emelyanov, (Wed Oct 31, 9:48 am)
Re: [PATCH 4/8] Auto-zero the allocated sock object, David Miller, (Thu Nov 1, 3:35 am)
[PATCH 3/8] Cleanup the allocation/freeing of the sock object, Pavel Emelyanov, (Wed Oct 31, 9:47 am)
Re: [PATCH 3/8] Cleanup the allocation/freeing of the sock o..., David Miller, (Thu Nov 1, 3:34 am)
[PATCH 2/8] Move the get_net() from sock_copy(), Pavel Emelyanov, (Wed Oct 31, 9:44 am)
Re: [PATCH 2/8] Move the get_net() from sock_copy(), David Miller, (Thu Nov 1, 3:32 am)
[PATCH 1/8] Move the sock_copy() from the header, Pavel Emelyanov, (Wed Oct 31, 9:42 am)
Re: [PATCH 1/8] Move the sock_copy() from the header, David Miller, (Thu Nov 1, 3:30 am)