Commit d00ef24f authored Jan 19, 2011 by Johan Hedberg Committed by Gustavo F. Padovan Jan 19, 2011

Bluetooth: Fix authentication request for L2CAP raw sockets

When there is an existing connection l2cap_check_security needs to be
called to ensure that the security level of the new socket is fulfilled.
Normally l2cap_do_start takes care of this, but that function doesn't
get called for SOCK_RAW type sockets. This patch adds the necessary
l2cap_check_security call to the appropriate branch in l2cap_do_connect.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

parent 8556edd3

net/bluetooth/l2cap.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1106,6 +1106,7 @@ static int l2cap_do_connect(struct sock *sk)
		if (sk->sk_type != SOCK_SEQPACKET &&
		sk->sk_type != SOCK_STREAM) {
		l2cap_sock_clear_timer(sk);
		if (l2cap_check_security(sk))
		sk->sk_state = BT_CONNECTED;
		} else
		l2cap_do_start(sk);

Admin message