| From foo@baz Wed Dec 3 17:06:53 PST 2014 |
| From: Mathias Krause <minipli@googlemail.com> |
| Date: Wed, 19 Nov 2014 18:05:26 +0100 |
| Subject: pptp: fix stack info leak in pptp_getname() |
| |
| From: Mathias Krause <minipli@googlemail.com> |
| |
| [ Upstream commit a5f6fc28d6e6cc379c6839f21820e62262419584 ] |
| |
| pptp_getname() only partially initializes the stack variable sa, |
| particularly only fills the pptp part of the sa_addr union. The code |
| thereby discloses 16 bytes of kernel stack memory via getsockname(). |
| |
| Fix this by memset(0)'ing the union before. |
| |
| Cc: Dmitry Kozlov <xeb@mail.ru> |
| Signed-off-by: Mathias Krause <minipli@googlemail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ppp/pptp.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/ppp/pptp.c |
| +++ b/drivers/net/ppp/pptp.c |
| @@ -506,7 +506,9 @@ static int pptp_getname(struct socket *s |
| int len = sizeof(struct sockaddr_pppox); |
| struct sockaddr_pppox sp; |
| |
| - sp.sa_family = AF_PPPOX; |
| + memset(&sp.sa_addr, 0, sizeof(sp.sa_addr)); |
| + |
| + sp.sa_family = AF_PPPOX; |
| sp.sa_protocol = PX_PROTO_PPTP; |
| sp.sa_addr.pptp = pppox_sk(sock->sk)->proto.pptp.src_addr; |
| |
