diff options
| author | Benjamin LaHaise <bcrl@kvack.org> | 2012-03-20 03:57:54 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-02 09:27:20 -0700 |
| commit | 6a26d49c67b852cfd9144f86f628f57c8ca00977 (patch) | |
| tree | 341594e55aef6d80015b6aa2e7ee37451dc3355b /net/l2tp | |
| parent | 0e6f4fc676f38d273d0a9018541a05b2e1ea90ab (diff) | |
| download | kernel_samsung_espresso10-6a26d49c67b852cfd9144f86f628f57c8ca00977.zip kernel_samsung_espresso10-6a26d49c67b852cfd9144f86f628f57c8ca00977.tar.gz kernel_samsung_espresso10-6a26d49c67b852cfd9144f86f628f57c8ca00977.tar.bz2 | |
Fix pppol2tp getsockname()
[ Upstream commit bbdb32cb5b73597386913d052165423b9d736145 ]
While testing L2TP functionality, I came across a bug in getsockname(). The
IP address returned within the pppol2tp_addr's addr memember was not being
set to the IP address in use. This bug is caused by using inet_sk() on the
wrong socket (the L2TP socket rather than the underlying UDP socket), and was
likely introduced during the addition of L2TPv3 support.
Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 39a21d0..13f9868 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -908,7 +908,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr, goto end_put_sess; } - inet = inet_sk(sk); + inet = inet_sk(tunnel->sock); if (tunnel->version == 2) { struct sockaddr_pppol2tp sp; len = sizeof(sp); |