diff options
| author | Mathias Krause <minipli@googlemail.com> | 2013-04-07 05:51:50 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-08 00:28:00 +0400 |
| commit | e11e0455c0d7d3d62276a0c55d9dfbc16779d691 (patch) | |
| tree | 7e3f51263eb0f889a47b7384e3408a912eb5a022 /net/bluetooth/rfcomm | |
| parent | 4683f42fde3977bdb4e8a09622788cc8b5313778 (diff) | |
| download | linux-e11e0455c0d7d3d62276a0c55d9dfbc16779d691.tar.xz | |
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>
Diffstat (limited to 'net/bluetooth/rfcomm')
| -rw-r--r-- | net/bluetooth/rfcomm/sock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index c23bae86263b..7c9224bcce17 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -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)) { rfcomm_dlc_accept(d); + msg->msg_namelen = 0; return 0; } |