aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMathias Krause2013-04-06 20:51:50 -0500
committerGreg Kroah-Hartman2013-05-01 11:46:01 -0500
commitc81ed3c15cf8c345f7cd78428fdc4bc745f45bbf (patch)
treee3ad281a92804e867157fd7176468c11d47f210d /net
parent8244d9fcae39a13ec99f85a9eaf8956b25341ae1 (diff)
downloadkernel-video-c81ed3c15cf8c345f7cd78428fdc4bc745f45bbf.tar.gz
kernel-video-c81ed3c15cf8c345f7cd78428fdc4bc745f45bbf.tar.xz
kernel-video-c81ed3c15cf8c345f7cd78428fdc4bc745f45bbf.zip
Bluetooth: RFCOMM - Fix missing msg_namelen update in rfcomm_sock_recvmsg()
[ Upstream commit e11e0455c0d7d3d62276a0c55d9dfbc16779d691 ] If RFCOMM_DEFER_SETUP is set in the flags, rfcomm_sock_recvmsg() returns early with 0 without updating the possibly set msg_namelen member. This, in turn, leads to a 128 byte kernel stack leak in net/socket.c. Fix this by updating msg_namelen in this case. For all other cases it will be handled in bt_sock_stream_recvmsg(). Signed-off-by: Mathias Krause <minipli@googlemail.com> Cc: Marcel Holtmann <marcel@holtmann.org> Cc: Gustavo Padovan <gustavo@padovan.org> Cc: Johan Hedberg <johan.hedberg@gmail.com> 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/bluetooth/rfcomm/sock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index ce3f6658f4b..970fc13d8e3 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -610,6 +610,7 @@ static int rfcomm_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
610 610
611 if (test_and_clear_bit(RFCOMM_DEFER_SETUP, &d->flags)) { 611 if (test_and_clear_bit(RFCOMM_DEFER_SETUP, &d->flags)) {
612 rfcomm_dlc_accept(d); 612 rfcomm_dlc_accept(d);
613 msg->msg_namelen = 0;
613 return 0; 614 return 0;
614 } 615 }
615 616