[PATCH 2.6.25] net sockets: fix timewait namespace regression

[Mark Lord]

YOSHIFUJI Hideaki / åèèæ wrote:
> In article <47FEB0E3.8080507@xxxxxx> (at Thu, 10 Apr 2008 20:29:23 -0400), Mark Lord <lkml@xxxxxx> says:
>
> > David Miller wrote:
> > > From: Mark Lord <lkml@xxxxxx>
> > > Date: Thu, 10 Apr 2008 20:16:11 -0400
> > >
> > > > [c67499c0e772064b37ad75eb69b28fc218752636 is first bad commit
> > > > commit c67499c0e772064b37ad75eb69b28fc218752636
> > > > Author: Pavel Emelyanov <xemul@xxxxxxxxxx>
> > > > Date:   Thu Jan 31 05:06:40 2008 -0800
> > > >
> > > >     [NETNS]: Tcp-v4 sockets per-net lookup.
> > > >
> > > >     Add a net argument to inet_lookup and propagate it further
> > > >     into lookup calls. Plus tune the __inet_check_established.
> > > >
> > > >     The dccp and inet_diag, which use that lookup functions
> > > >     pass the init_net into them.
> > > >
> > > >     Signed-off-by: Pavel Emelyanov <xemul@xxxxxxxxxx>
> > > >     Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> > > Thanks Mark.
> > >
> > > Pavel can you take a look?  I suspect that the namespace
> > > changes or gets NULL'd out somehow and this leads to the
> > > resets because the socket can no longer be found.  Perhaps
> > > it's even a problem with time-wait socket namespace
> > > propagation.
> > ..
> >
> > My system here is now set up for quick/easy retest, if you have any
> > suggestions or patches to try out.
>
> Please try this, from net-2.6.26 tree.
..

Works perfectly, thanks.  Looks obvious, too.
Push it out to Linus now for 2.6.25.

Thanks!

Acked-by: Mark Lord <mlord@xxxxxxxxx>

> ----
> > From 8d9f1744cab50acb0c6c9553be533621e01f178b Mon Sep 17 00:00:00 2001
> From: Daniel Lezcano <dlezcano@xxxxxxxxxx>
> Date: Fri, 21 Mar 2008 04:12:54 -0700
> Subject: [PATCH] [NETNS][IPV6] tcp - assign the netns for timewait sockets
>
> Copy the network namespace from the socket to the timewait socket.
>
> Signed-off-by: Daniel Lezcano <dlezcano@xxxxxxxxxx>
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
..

> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@xxxxxxxxxxxxxx>
Acked-by: Mark Lord <mlord@xxxxxxxxx>


> ---
>  net/ipv4/inet_timewait_sock.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
> index 876169f..717c411 100644
> --- a/net/ipv4/inet_timewait_sock.c
> +++ b/net/ipv4/inet_timewait_sock.c
> @@ -124,6 +124,7 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, const int stat
>  		tw->tw_hash	    = sk->sk_hash;
>  		tw->tw_ipv6only	    = 0;
>  		tw->tw_prot	    = sk->sk_prot_creator;
> +		tw->tw_net          = sk->sk_net;
>  		atomic_set(&tw->tw_refcnt, 1);
>  		inet_twsk_dead_node_init(tw);
>  		__module_get(tw->tw_prot->owner);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/