Unverified Commit 0799fce5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14722 Bluetooth: MGMT: Fix possible deadlocks 

Merge Pull Request from: @ci-robot 
 
PR sync from: dinglongwei <dinglongwei1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XV6TPEKTGUXZJNSOXKGYXAJF722BO5Q4/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEAGI 
 
Link:https://gitee.com/openeuler/kernel/pulls/14722

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 75584e8c c0305543

net/bluetooth/mgmt.c

+18 −9
Original line number Diff line number Diff line
@@ -1510,7 +1510,8 @@ static void mgmt_set_discoverable_complete(struct hci_dev *hdev, void *data, 
	bt_dev_dbg(hdev, "err %d", err);



	/* Make sure cmd still outstanding. */

	if (cmd != pending_find(MGMT_OP_SET_DISCOVERABLE, hdev))

	if (err == -ECANCELED ||

	    cmd != pending_find(MGMT_OP_SET_DISCOVERABLE, hdev))

		return;



	hci_dev_lock(hdev);
@@ -1684,7 +1685,8 @@ static void mgmt_set_connectable_complete(struct hci_dev *hdev, void *data, 
	bt_dev_dbg(hdev, "err %d", err);



	/* Make sure cmd still outstanding. */

	if (cmd != pending_find(MGMT_OP_SET_CONNECTABLE, hdev))

	if (err == -ECANCELED ||

	    cmd != pending_find(MGMT_OP_SET_CONNECTABLE, hdev))

		return;



	hci_dev_lock(hdev);
@@ -1917,7 +1919,7 @@ static void set_ssp_complete(struct hci_dev *hdev, void *data, int err) 
	bool changed;



	/* Make sure cmd still outstanding. */

	if (cmd != pending_find(MGMT_OP_SET_SSP, hdev))

	if (err == -ECANCELED || cmd != pending_find(MGMT_OP_SET_SSP, hdev))

		return;



	if (err) {
@@ -3782,7 +3784,8 @@ static void set_name_complete(struct hci_dev *hdev, void *data, int err) 


	bt_dev_dbg(hdev, "err %d", err);



	if (cmd != pending_find(MGMT_OP_SET_LOCAL_NAME, hdev))

	if (err == -ECANCELED ||

	    cmd != pending_find(MGMT_OP_SET_LOCAL_NAME, hdev))

		return;



	if (status) {
@@ -3957,7 +3960,8 @@ static void set_default_phy_complete(struct hci_dev *hdev, void *data, int err) 
	struct sk_buff *skb = cmd->skb;

	u8 status = mgmt_status(err);



	if (cmd != pending_find(MGMT_OP_SET_PHY_CONFIGURATION, hdev))

	if (err == -ECANCELED ||

	    cmd != pending_find(MGMT_OP_SET_PHY_CONFIGURATION, hdev))

		return;



	if (!status) {
@@ -5848,13 +5852,16 @@ static void start_discovery_complete(struct hci_dev *hdev, void *data, int err) 
{

	struct mgmt_pending_cmd *cmd = data;



	bt_dev_dbg(hdev, "err %d", err);



	if (err == -ECANCELED)

		return;



	if (cmd != pending_find(MGMT_OP_START_DISCOVERY, hdev) &&

	    cmd != pending_find(MGMT_OP_START_LIMITED_DISCOVERY, hdev) &&

	    cmd != pending_find(MGMT_OP_START_SERVICE_DISCOVERY, hdev))

		return;



	bt_dev_dbg(hdev, "err %d", err);



	mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, mgmt_status(err),

			  cmd->param, 1);

	mgmt_pending_remove(cmd);
@@ -6087,7 +6094,8 @@ static void stop_discovery_complete(struct hci_dev *hdev, void *data, int err) 
{

	struct mgmt_pending_cmd *cmd = data;



	if (cmd != pending_find(MGMT_OP_STOP_DISCOVERY, hdev))

	if (err == -ECANCELED ||

	    cmd != pending_find(MGMT_OP_STOP_DISCOVERY, hdev))

		return;



	bt_dev_dbg(hdev, "err %d", err);
@@ -8032,7 +8040,8 @@ static void read_local_oob_ext_data_complete(struct hci_dev *hdev, void *data, 
	u8 status = mgmt_status(err);

	u16 eir_len;



	if (cmd != pending_find(MGMT_OP_READ_LOCAL_OOB_EXT_DATA, hdev))

	if (err == -ECANCELED ||

	    cmd != pending_find(MGMT_OP_READ_LOCAL_OOB_EXT_DATA, hdev))

		return;



	if (!status) {