[PATCH] [PPPOL2TP] Add missing sock_put() in pppol2tp_release()

[PATCH] [PPPOL2TP] Add missing sock_put() in pppol2tp_release()

[Frédéric Moulins]

pppol2tp_sock_to_session() do sock_hold() if the session to release is
not NULL.

Signed-off-by: Frédéric Moulins <frederic.moulins@alsatis.com>
---
Patch is applicable to kernels 2.6.26 and following.

Tested with a 2.6.26 stable kernel:
without this patch, a session in a persistent tunnel cannot be
established again (connect failed: -17), and the pppol2tp kernel module
cannot be removed because still considered in use after stopping all
userspace daemons.

diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index ff175e8..de80ba4 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -1353,6 +1353,7 @@ static int pppol2tp_release(struct socket *sock)
 			kfree_skb(skb);
 			sock_put(sk);
 		}
+		sock_put(sk);
 	}
 
 	release_sock(sk);

Re: [PATCH] [PPPOL2TP] Add missing sock_put() in pppol2tp_release()

[David Miller]

From: Frédéric Moulins <frederic.moulins@alsatis.com>
Date: Thu, 27 Nov 2008 17:18:51 +0100

> pppol2tp_sock_to_session() do sock_hold() if the session to release is
> not NULL.
> 
> Signed-off-by: Frédéric Moulins <frederic.moulins@alsatis.com>

Applied, but please post networking patches at least CC:'d to
netdev@vger.kernel.org so that your work gets properly tracked
at:

	http://patchwork.ozlabs.org/project/netdev/list

Thanks.

> ---
> Patch is applicable to kernels 2.6.26 and following.
> 
> Tested with a 2.6.26 stable kernel:
> without this patch, a session in a persistent tunnel cannot be
> established again (connect failed: -17), and the pppol2tp kernel module
> cannot be removed because still considered in use after stopping all
> userspace daemons.
> 
> diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
> index ff175e8..de80ba4 100644
> --- a/drivers/net/pppol2tp.c
> +++ b/drivers/net/pppol2tp.c
> @@ -1353,6 +1353,7 @@ static int pppol2tp_release(struct socket *sock)
>  			kfree_skb(skb);
>  			sock_put(sk);
>  		}
> +		sock_put(sk);
>  	}
>  
>  	release_sock(sk);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/