[2/2] net: ax25: fix information leak to userland harder

Message ID 1296496755-16815-3-git-send-email-apw@canonical.com
State Accepted
Commit b3a0461263b9fbe717d064aed4c108f745d3b497
Headers show

Commit Message

Andy Whitcroft Jan. 31, 2011, 5:59 p.m.
From: Kees Cook <kees.cook@canonical.com>

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>
Cc: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

BugLink: http://bugs.launchpad.net/bugs/710714
(cherry picked from commit 5b919f833d9d60588d026ad82d17f17e8872c7a9 upstream)
Signed-off-by: Andy Whitcroft <apw@canonical.com>
 net/ax25/af_ax25.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 6e2371a..763fd0b 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1392,7 +1392,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));
 	ax25 = ax25_sk(sk);