diff options
| author | Mathias Krause <minipli@googlemail.com> | 2013-04-07 01:51:59 +0000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2013-06-10 11:43:45 +0200 |
| commit | 3cab351d977035a0f397491d3266a15eb8e363dc (patch) | |
| tree | 87af5d01b6632d13d8b1b7c24c7632494071896f /net/rose | |
| parent | a86c9b39fdff1740b631b94901e0ea0bb0c22789 (diff) | |
rose: fix info leak via msg_name in rose_recvmsg()
[ Upstream commit 4a184233f21645cf0b719366210ed445d1024d72 ]
The code in rose_recvmsg() does not initialize all of the members of
struct sockaddr_rose/full_sockaddr_rose when filling the sockaddr info.
Nor does it initialize the padding bytes of the structure inserted by
the compiler for alignment. This will lead to leaking uninitialized
kernel stack bytes in net/socket.c.
Fix the issue by initializing the memory used for sockaddr info 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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'net/rose')
| -rw-r--r-- | net/rose/af_rose.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 523efbb9ad08..2984999dc59e 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -1275,6 +1275,7 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock, skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); if (srose != NULL) { + memset(srose, 0, msg->msg_namelen); srose->srose_family = AF_ROSE; srose->srose_addr = rose->dest_addr; srose->srose_call = rose->dest_call; |