aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMathias Krause2013-04-06 20:51:48 -0500
committerGreg Kroah-Hartman2013-05-01 11:46:00 -0500
commitc1c820758a240b45ab413304c36c6bede9c2933c (patch)
treefaf70f51aa3f605085a04287a786be08e7c0efa5 /net
parent5ee96cca09c7be84ed921150dde4ff34b724377f (diff)
downloadkernel-video-c1c820758a240b45ab413304c36c6bede9c2933c.tar.gz
kernel-video-c1c820758a240b45ab413304c36c6bede9c2933c.tar.xz
kernel-video-c1c820758a240b45ab413304c36c6bede9c2933c.zip
ax25: fix info leak via msg_name in ax25_recvmsg()
[ Upstream commit ef3313e84acbf349caecae942ab3ab731471f1a1 ] When msg_namelen is non-zero the sockaddr info gets filled out, as requested, but the code fails to initialize the padding bytes of struct sockaddr_ax25 inserted by the compiler for alignment. Additionally the msg_namelen value is updated to sizeof(struct full_sockaddr_ax25) but is not always filled up to this size. Both issues lead to the fact that the code will leak uninitialized kernel stack bytes in net/socket.c. Fix both issues by initializing the memory with memset(0). Signed-off-by: Mathias Krause <minipli@googlemail.com> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/ax25/af_ax25.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 779095ded68..d53a123e36a 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1647,6 +1647,7 @@ static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock,
1647 ax25_address src; 1647 ax25_address src;
1648 const unsigned char *mac = skb_mac_header(skb); 1648 const unsigned char *mac = skb_mac_header(skb);
1649 1649
1650 memset(sax, 0, sizeof(struct full_sockaddr_ax25));
1650 ax25_addr_parse(mac + 1, skb->data - mac - 1, &src, NULL, 1651 ax25_addr_parse(mac + 1, skb->data - mac - 1, &src, NULL,
1651 &digi, NULL, NULL); 1652 &digi, NULL, NULL);
1652 sax->sax25_family = AF_AX25; 1653 sax->sax25_family = AF_AX25;