diff options
author | Mathias Krause | 2013-04-06 20:51:51 -0500 |
---|---|---|
committer | Greg Kroah-Hartman | 2013-05-01 11:46:01 -0500 |
commit | 95fb8027002f3c92e35b03a825abc131f744114c (patch) | |
tree | 52a4c1861b7d1a71ed688d6439452d71c3f4e977 /net | |
parent | c81ed3c15cf8c345f7cd78428fdc4bc745f45bbf (diff) | |
download | kernel-video-95fb8027002f3c92e35b03a825abc131f744114c.tar.gz kernel-video-95fb8027002f3c92e35b03a825abc131f744114c.tar.xz kernel-video-95fb8027002f3c92e35b03a825abc131f744114c.zip |
Bluetooth: SCO - Fix missing msg_namelen update in sco_sock_recvmsg()
[ Upstream commit c8c499175f7d295ef867335bceb9a76a2c3cdc38 ]
If the socket is in state BT_CONNECT2 and BT_SK_DEFER_SETUP is set in
the flags, sco_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_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/sco.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index aaf1957bc4f..cc16d1bccf5 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
@@ -667,6 +667,7 @@ static int sco_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
667 | test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) { | 667 | test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) { |
668 | hci_conn_accept(pi->conn->hcon, 0); | 668 | hci_conn_accept(pi->conn->hcon, 0); |
669 | sk->sk_state = BT_CONFIG; | 669 | sk->sk_state = BT_CONFIG; |
670 | msg->msg_namelen = 0; | ||
670 | 671 | ||
671 | release_sock(sk); | 672 | release_sock(sk); |
672 | return 0; | 673 | return 0; |