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

!11228 Bluetooth: MGMT: Add error handling to pair_device() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/TMMAZASZCPQECJWGDX23DSNJ73LJC3MW/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAMK01 
 
Link:https://gitee.com/openeuler/kernel/pulls/11228

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 9be0c95e 6f6d99bf

net/bluetooth/mgmt.c

+4 −0
Original line number Diff line number Diff line
@@ -3449,6 +3449,10 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
		 * will be kept and this function does nothing.

		 */

		p = hci_conn_params_add(hdev, &cp->addr.bdaddr, addr_type);

		if (!p) {

			err = -EIO;

			goto unlock;

		}



		if (p->auto_connect == HCI_AUTO_CONN_EXPLICIT)

			p->auto_connect = HCI_AUTO_CONN_DISABLED;