Skip to content
Browse files

Bluetooth: RFCOMM - Fix missing msg_namelen update in rfcomm_sock_rec…

…vmsg()

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>
  • Loading branch information...
1 parent 4683f42 commit e11e0455c0d7d3d62276a0c55d9dfbc16779d691 @minipli minipli committed with davem330 Apr 7, 2013
Showing with 1 addition and 0 deletions.
  1. +1 −0 net/bluetooth/rfcomm/sock.c
View
1 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;
}

0 comments on commit e11e045

Please sign in to comment.
Something went wrong with that request. Please try again.