From: Kees Cook <kees.cook@canonical.com>
Date: Wed, 12 Jan 2011 08:34:49 +0000 (-0800)
Subject: net: ax25: fix information leak to userland harder
X-Git-Tag: firefly_0821_release~10186^2~170
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c4f6afb9ce907df438c67b2e5d5ce3e2448b9b38;p=firefly-linux-kernel-4.4.55.git

net: ax25: fix information leak to userland harder

commit 5b919f833d9d60588d026ad82d17f17e8872c7a9 upstream.

Commit fe10ae53384e48c51996941b7720ee16995cbcb7 adds a memset() to clear
the structure being sent back to userspace, but accidentally used the
wrong size.

Reported-by: Brad Spengler <spender@grsecurity.net>
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 608a97b93968..1e9f3e420cad 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1391,7 +1391,7 @@ static int ax25_getname(struct socket *sock, struct sockaddr *uaddr,
 	ax25_cb *ax25;
 	int err = 0;
 
-	memset(fsa, 0, sizeof(fsa));
+	memset(fsa, 0, sizeof(*fsa));
 	lock_sock(sk);
 	ax25 = ax25_sk(sk);