summaryrefslogtreecommitdiff
path: root/net/ax25
diff options
context:
space:
mode:
authorVasiliy Kulikov <segooon@gmail.com>2010-11-10 10:14:33 -0800
committerDavid S. Miller <davem@davemloft.net>2010-11-10 10:14:33 -0800
commitfe10ae53384e48c51996941b7720ee16995cbcb7 (patch)
treeb5a4332bd71d40a6193bc62d097808abfe62997a /net/ax25
parent332dd96f7ac15e937088fe11f15cfe0210e8edd1 (diff)
downloadlinux-next-fe10ae53384e48c51996941b7720ee16995cbcb7.tar.gz
net: ax25: fix information leak to userland
Sometimes ax25_getname() doesn't initialize all members of fsa_digipeater field of fsa struct, also the struct has padding bytes between sax25_call and sax25_ndigis fields. This structure is then copied to userland. It leads to leaking of contents of kernel stack memory. Signed-off-by: Vasiliy Kulikov <segooon@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ax25')
-rw-r--r--net/ax25/af_ax25.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 26eaebf4aaa9..bb86d2932394 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1392,6 +1392,7 @@ static int ax25_getname(struct socket *sock, struct sockaddr *uaddr,
ax25_cb *ax25;
int err = 0;
+ memset(fsa, 0, sizeof(fsa));
lock_sock(sk);
ax25 = ax25_sk(sk);
@@ -1403,7 +1404,6 @@ static int ax25_getname(struct socket *sock, struct sockaddr *uaddr,
fsa->fsa_ax25.sax25_family = AF_AX25;
fsa->fsa_ax25.sax25_call = ax25->dest_addr;
- fsa->fsa_ax25.sax25_ndigis = 0;
if (ax25->digipeat != NULL) {
ndigi = ax25->digipeat->ndigi;