diff options
| author | Mathias Krause <minipli@googlemail.com> | 2013-04-07 01:51:57 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-05-13 15:02:41 +0100 |
| commit | c0bf432a4c3e6870fc87debb9393cb93f638dcba (patch) | |
| tree | 6905defe7108d9f6158b17a972412cd99e352f3f /net/netrom | |
| parent | d0dd0a3d5d31807eea0d54bd561cf178c45a24ca (diff) | |
| download | kernel_samsung_smdk4412-c0bf432a4c3e6870fc87debb9393cb93f638dcba.zip kernel_samsung_smdk4412-c0bf432a4c3e6870fc87debb9393cb93f638dcba.tar.gz kernel_samsung_smdk4412-c0bf432a4c3e6870fc87debb9393cb93f638dcba.tar.bz2 | |
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).
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/netrom')
| -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 f156382..aca28b9 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -1178,6 +1178,7 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock, } if (sax != NULL) { + memset(sax, 0, sizeof(sax)); sax->sax25_family = AF_NETROM; skb_copy_from_linear_data_offset(skb, 7, sax->sax25_call.ax25_call, AX25_ADDR_LEN); |