This is a note to let you know that I've just added the patch titled
tipc: fix info leaks via msg_name in recv_msg/recv_stream
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tipc-fix-info-leaks-via-msg_name-in-recv_msg-recv_stream.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 035f2df5f782a4ca71a6036d6a0e1caf29ae6619 Mon Sep 17 00:00:00 2001
From: Mathias Krause <[email protected]>
Date: Sun, 7 Apr 2013 01:52:00 +0000
Subject: tipc: fix info leaks via msg_name in recv_msg/recv_stream
From: Mathias Krause <[email protected]>
[ Upstream commit 60085c3d009b0df252547adb336d1ccca5ce52ec ]
The code in set_orig_addr() does not initialize all of the members of
struct sockaddr_tipc when filling the sockaddr info -- namely the union
is only partly filled. This will make recv_msg() and recv_stream() --
the only users of this function -- leak kernel stack memory as the
msg_name member is a local variable in net/socket.c.
Additionally to that both recv_msg() and recv_stream() fail to update
the msg_namelen member to 0 while otherwise returning with 0, i.e.
"success". This is the case for, e.g., non-blocking sockets. This will
lead to a 128 byte kernel stack leak in net/socket.c.
Fix the first issue by initializing the memory of the union with
memset(0). Fix the second one by setting msg_namelen to 0 early as it
will be updated later if we're going to fill the msg_name member.
Signed-off-by: Mathias Krause <[email protected]>
Cc: Jon Maloy <[email protected]>
Cc: Allan Stephens <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/tipc/socket.c | 7 +++++++
1 file changed, 7 insertions(+)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -829,6 +829,7 @@ static void set_orig_addr(struct msghdr
if (addr) {
addr->family = AF_TIPC;
addr->addrtype = TIPC_ADDR_ID;
+ memset(&addr->addr, 0, sizeof(addr->addr));
addr->addr.id.ref = msg_origport(msg);
addr->addr.id.node = msg_orignode(msg);
addr->addr.name.domain = 0; /* could leave uninitialized */
@@ -948,6 +949,9 @@ static int recv_msg(struct kiocb *iocb,
goto exit;
}
+ /* will be updated in set_orig_addr() if needed */
+ m->msg_namelen = 0;
+
timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
restart:
@@ -1074,6 +1078,9 @@ static int recv_stream(struct kiocb *ioc
goto exit;
}
+ /* will be updated in set_orig_addr() if needed */
+ m->msg_namelen = 0;
+
target = sock_rcvlowat(sk, flags & MSG_WAITALL, buf_len);
timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
restart:
Patches currently in stable-queue which might be from [email protected] are
queue-3.0/irda-fix-missing-msg_namelen-update-in-irda_recvmsg_dgram.patch
queue-3.0/bluetooth-rfcomm-fix-missing-msg_namelen-update-in-rfcomm_sock_recvmsg.patch
queue-3.0/llc-fix-missing-msg_namelen-update-in-llc_ui_recvmsg.patch
queue-3.0/atm-update-msg_namelen-in-vcc_recvmsg.patch
queue-3.0/iucv-fix-missing-msg_namelen-update-in-iucv_sock_recvmsg.patch
queue-3.0/ax25-fix-info-leak-via-msg_name-in-ax25_recvmsg.patch
queue-3.0/tipc-fix-info-leaks-via-msg_name-in-recv_msg-recv_stream.patch
queue-3.0/netrom-fix-info-leak-via-msg_name-in-nr_recvmsg.patch
queue-3.0/caif-fix-missing-msg_namelen-update-in-caif_seqpkt_recvmsg.patch
queue-3.0/bluetooth-fix-possible-info-leak-in-bt_sock_recvmsg.patch
queue-3.0/rose-fix-info-leak-via-msg_name-in-rose_recvmsg.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
