diff options
| author | Mathias Krause <minipli@googlemail.com> | 2013-04-07 01:51:50 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-01 09:41:04 -0700 |
| commit | 2d97f68d03180ad0a47fdb7c02f0fecdac9ad9a7 (patch) | |
| tree | a6e89fe7325ebee91833c2c967f3e493e33bdf43 /net | |
| parent | a776cc3f3ae0b7d0f6137f4dc98470e3d4bb52d0 (diff) | |
| download | linux-3.10-2d97f68d03180ad0a47fdb7c02f0fecdac9ad9a7.tar.gz linux-3.10-2d97f68d03180ad0a47fdb7c02f0fecdac9ad9a7.tar.bz2 linux-3.10-2d97f68d03180ad0a47fdb7c02f0fecdac9ad9a7.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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 8d1edd7207d..c79db7f7533 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -628,6 +628,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; } |