Skip to content

Commit ef3313e

Browse files
miniplidavem330
authored andcommitted
ax25: fix info leak via msg_name in ax25_recvmsg()
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). Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 9b3e617 commit ef3313e

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Diff for: net/ax25/af_ax25.c

+1
Original file line numberDiff line numberDiff line change
@@ -1642,6 +1642,7 @@ static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock,
16421642
ax25_address src;
16431643
const unsigned char *mac = skb_mac_header(skb);
16441644

1645+
memset(sax, 0, sizeof(struct full_sockaddr_ax25));
16451646
ax25_addr_parse(mac + 1, skb->data - mac - 1, &src, NULL,
16461647
&digi, NULL, NULL);
16471648
sax->sax25_family = AF_AX25;

0 commit comments

Comments
 (0)