Skip to content

Commit e11e045

Browse files
miniplidavem330
authored andcommitted
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>
1 parent 4683f42 commit e11e045

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Diff for: net/bluetooth/rfcomm/sock.c

+1
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,7 @@ static int rfcomm_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
608608

609609
if (test_and_clear_bit(RFCOMM_DEFER_SETUP, &d->flags)) {
610610
rfcomm_dlc_accept(d);
611+
msg->msg_namelen = 0;
611612
return 0;
612613
}
613614

0 commit comments

Comments
 (0)