Commit 896ea28e authored Oct 25, 2012 by Paulo Sérgio Committed by Gustavo Padovan Nov 09, 2012

Bluetooth: Fix error status when pairing fails



When pairing fails due to wrong confirm value, the management layer
doesn't report a proper error status. It sends
MGMT_STATUS_CONNECT_FAILED instead of MGMT_STATUS_AUTH_FAILED.

Most of management functions that receive a status as a parameter
expects for it to be encoded as a HCI status. But when a SMP pairing
fails, the SMP layer sends the SMP reason as the error status to the
management layer.

This commit maps all SMP reasons to HCI_ERROR_AUTH_FAILURE, which will
be converted to MGMT_STATUS_AUTH_FAILED in the management layer.

Reported-by: Claudio Takahasi <claudio.takahasi@openbossa.org>
Reviewed-by: João Paulo Rechi Vita <jprvita@openbossa.org>
Signed-off-by: Paulo Sérgio <paulo.sergio@openbossa.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

parent 476e44cb

net/bluetooth/smp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -267,7 +267,7 @@ static void smp_failure(struct l2cap_conn *conn, u8 reason, u8 send)

		clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->hcon->flags);
		mgmt_auth_failed(conn->hcon->hdev, conn->dst, hcon->type,
		hcon->dst_type, reason);
		hcon->dst_type, HCI_ERROR_AUTH_FAILURE);

		cancel_delayed_work_sync(&conn->security_timer);

Admin message