Commit e11e0455 authored Apr 07, 2013 by Mathias Krause Committed by David S. Miller Apr 07, 2013

Bluetooth: RFCOMM - Fix missing msg_namelen update in rfcomm_sock_recvmsg()



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().

Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 4683f42f

net/bluetooth/rfcomm/sock.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -608,6 +608,7 @@ static int rfcomm_sock_recvmsg(struct kiocb iocb, struct socket sock,

	if (test_and_clear_bit(RFCOMM_DEFER_SETUP, &d->flags)) {		if (test_and_clear_bit(RFCOMM_DEFER_SETUP, &d->flags)) {
	rfcomm_dlc_accept(d);		rfcomm_dlc_accept(d);
			msg->msg_namelen = 0;
	return 0;		return 0;
	}		}