Commit d7b2fdfb authored by Zhengping Jiang's avatar Zhengping Jiang Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: mgmt: Fix refresh cached connection info 



Set the connection data before calling get_conn_info_sync, so it can be
verified the connection is still connected, before refreshing cached
values.

Fixes: 47db6b42 ("Bluetooth: hci_sync: Convert MGMT_OP_GET_CONN_INFO")
Signed-off-by: default avatarZhengping Jiang <jiangzp@google.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 34a718bc

net/bluetooth/mgmt.c

+5 −5
Original line number Diff line number Diff line
@@ -6821,11 +6821,14 @@ static int get_conn_info(struct sock *sk, struct hci_dev *hdev, void *data, 


		cmd = mgmt_pending_new(sk, MGMT_OP_GET_CONN_INFO, hdev, data,

				       len);

		if (!cmd)

		if (!cmd) {

			err = -ENOMEM;

		else

		} else {

			hci_conn_hold(conn);

			cmd->user_data = hci_conn_get(conn);

			err = hci_cmd_sync_queue(hdev, get_conn_info_sync,

						 cmd, get_conn_info_complete);

		}



		if (err < 0) {

			mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CONN_INFO,
@@ -6837,9 +6840,6 @@ static int get_conn_info(struct sock *sk, struct hci_dev *hdev, void *data, 
			goto unlock;

		}



		hci_conn_hold(conn);

		cmd->user_data = hci_conn_get(conn);



		conn->conn_info_timestamp = jiffies;

	} else {

		/* Cache is valid, just reply with values cached in hci_conn */