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

Commit 1425acb7 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Fix mgmt_pair_device imediate error responses 



When possible cmd_complete should be returned instead of cmd_status
since it contains the remote address (this helps user-space track what
exactly failed).

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

net/bluetooth/mgmt.c

+11 −2
Original line number Diff line number Diff line
@@ -1366,6 +1366,7 @@ static int pair_device(struct sock *sk, u16 index, unsigned char *data, u16 len) 
{

	struct hci_dev *hdev;

	struct mgmt_cp_pair_device *cp;

	struct mgmt_rp_pair_device rp;

	struct pending_cmd *cmd;

	u8 sec_level, auth_type;

	struct hci_conn *conn;
@@ -1397,14 +1398,22 @@ static int pair_device(struct sock *sk, u16 index, unsigned char *data, u16 len) 
		conn = hci_connect(hdev, LE_LINK, &cp->addr.bdaddr, sec_level,

								auth_type);



	memset(&rp, 0, sizeof(rp));

	bacpy(&rp.addr.bdaddr, &cp->addr.bdaddr);

	rp.addr.type = cp->addr.type;



	if (IS_ERR(conn)) {

		err = PTR_ERR(conn);

		rp.status = -PTR_ERR(conn);

		err = cmd_complete(sk, index, MGMT_OP_PAIR_DEVICE,

							&rp, sizeof(rp));

		goto unlock;

	}



	if (conn->connect_cfm_cb) {

		hci_conn_put(conn);

		err = cmd_status(sk, index, MGMT_OP_PAIR_DEVICE, EBUSY);

		rp.status = EBUSY;

		err = cmd_complete(sk, index, MGMT_OP_PAIR_DEVICE,

							&rp, sizeof(rp));

		goto unlock;

	}