diff options
author | Mathias Krause | 2013-04-06 20:51:57 -0500 |
---|---|---|
committer | Greg Kroah-Hartman | 2013-05-01 11:46:02 -0500 |
commit | 2f1966a23ff73a9e7520567c454b4d140c93d39b (patch) | |
tree | 40481202dad8649b04aefc011308cb2a51540aa0 /net | |
parent | b2d37bf219dbe8153a5e708c84ef5d968c449cfe (diff) | |
download | kernel-video-2f1966a23ff73a9e7520567c454b4d140c93d39b.tar.gz kernel-video-2f1966a23ff73a9e7520567c454b4d140c93d39b.tar.xz kernel-video-2f1966a23ff73a9e7520567c454b4d140c93d39b.zip |
netrom: fix info leak via msg_name in nr_recvmsg()
[ Upstream commits 3ce5efad47b62c57a4f5c54248347085a750ce0e and
c802d759623acbd6e1ee9fbdabae89159a513913 ]
In case msg_name is set 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. Also
the sax25_ndigis member does not get assigned, leaking four more
bytes.
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/netrom/af_netrom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 7261eb81974..14c106b49e9 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c | |||
@@ -1177,6 +1177,7 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1177 | } | 1177 | } |
1178 | 1178 | ||
1179 | if (sax != NULL) { | 1179 | if (sax != NULL) { |
1180 | memset(sax, 0, sizeof(sax)); | ||
1180 | sax->sax25_family = AF_NETROM; | 1181 | sax->sax25_family = AF_NETROM; |
1181 | skb_copy_from_linear_data_offset(skb, 7, sax->sax25_call.ax25_call, | 1182 | skb_copy_from_linear_data_offset(skb, 7, sax->sax25_call.ax25_call, |
1182 | AX25_ADDR_LEN); | 1183 | AX25_ADDR_LEN); |