Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d7cee58 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Fix mgmt response when HCI_Write_Scan_Enable fails 



A proper mgmt_command_status should be returned to user-space if either
discoverable or connectable enabling fails.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 16ab91ab

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -911,6 +911,7 @@ int mgmt_index_removed(u16 index); 
int mgmt_powered(u16 index, u8 powered);

int mgmt_discoverable(u16 index, u8 discoverable);

int mgmt_connectable(u16 index, u8 connectable);

int mgmt_write_scan_failed(u16 index, u8 scan, u8 status);

int mgmt_new_key(u16 index, struct link_key *key, u8 persistent);

int mgmt_connected(u16 index, bdaddr_t *bdaddr, u8 link_type);

int mgmt_disconnected(u16 index, bdaddr_t *bdaddr);

net/bluetooth/hci_event.c

+6 −3
Original line number Diff line number Diff line
@@ -280,11 +280,14 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb) 
	if (!sent)

		return;



	if (status != 0)

		goto done;



	param = *((__u8 *) sent);



	if (status != 0) {

		mgmt_write_scan_failed(hdev->id, param, status);

		hdev->discov_timeout = 0;

		goto done;

	}



	old_pscan = test_and_clear_bit(HCI_PSCAN, &hdev->flags);

	old_iscan = test_and_clear_bit(HCI_ISCAN, &hdev->flags);

net/bluetooth/mgmt.c

+13 −0
Original line number Diff line number Diff line
@@ -2056,6 +2056,19 @@ int mgmt_connectable(u16 index, u8 connectable) 
	return ret;

}



int mgmt_write_scan_failed(u16 index, u8 scan, u8 status)

{

	if (scan & SCAN_PAGE)

		mgmt_pending_foreach(MGMT_OP_SET_CONNECTABLE, index,

						cmd_status_rsp, &status);



	if (scan & SCAN_INQUIRY)

		mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, index,

						cmd_status_rsp, &status);



	return 0;

}



int mgmt_new_key(u16 index, struct link_key *key, u8 persistent)

{

	struct mgmt_ev_new_key ev;