Bluetooth: RFCOMM - Fix missing msg_namelen update in rfcomm_sock_recvmsg()
authorMathias Krause <minipli@googlemail.com>
Sun, 7 Apr 2013 01:51:50 +0000 (01:51 +0000)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Mon, 10 Feb 2014 21:11:17 +0000 (16:11 -0500)
commit5f9cd45f92653b4cc8493a47c61a36f5b7426cf1
tree4d02bcc3737160efa07691b0f7dacc6a421ce742
parent8ad4a5c58c7192de527ff2fd818fc362eb270013
Bluetooth: RFCOMM - Fix missing msg_namelen update in rfcomm_sock_recvmsg()

commit e11e0455c0d7d3d62276a0c55d9dfbc16779d691 upstream.

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>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
net/bluetooth/rfcomm/sock.c