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 08:56:39 -0700 |
| commit | ebffd4ef7c48ec51176e5214d344eddf7283fa35 (patch) | |
| tree | 35e1f5835fa9d9bf82a53cc5095c69b3c0b7564b /net/bluetooth/rfcomm | |
| parent | 0a740ea0de6c84544fe8e68d235da75341f30edd (diff) | |
| download | kernel_samsung_espresso10-ebffd4ef7c48ec51176e5214d344eddf7283fa35.zip kernel_samsung_espresso10-ebffd4ef7c48ec51176e5214d344eddf7283fa35.tar.gz kernel_samsung_espresso10-ebffd4ef7c48ec51176e5214d344eddf7283fa35.tar.bz2 | |
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/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 9dfe702..bf6f8f5 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -624,6 +624,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; } |