linux-kernel - [PATCH] Bluetooth: btusb: Fix failed to send func ctrl for MediaTek devices.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20211025150325.2143-1-mark-yw.chen@mediatek.com>
Date:   Mon, 25 Oct 2021 23:03:25 +0800
From:   <mark-yw.chen@...iatek.com>
To:     <marcel@...tmann.org>, <johan.hedberg@...il.com>
CC:     <mark-yw.chen@...iatek.com>, <will-cy.lee@...iatek.com>,
        <linux-bluetooth@...r.kernel.org>,
        <linux-mediatek@...ts.infradead.org>,
        <linux-kernel@...r.kernel.org>
Subject: [PATCH] Bluetooth: btusb: Fix failed to send func ctrl for MediaTek devices.

From: "mark-yw.chen" <mark-yw.chen@...iatek.com>

* Use usb_autopm_get_interface() and usb_autopm_put_interface()
  in btusb_mtk_shutdown(), it could send func ctrl after enabling
  autosuspend.

Bluetooth: btusb_mtk_hci_wmt_sync() hci0: Execution of wmt command timed
out
Bluetooth: btusb_mtk_shutdown() hci0: Failed to send wmt func ctrl
(-110)

Signed-off-by: mark-yw.chen <mark-yw.chen@...iatek.com>
---
 drivers/bluetooth/btusb.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 87b71740fad8..9e61395d1ff2 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2973,9 +2973,14 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
 static int btusb_mtk_shutdown(struct hci_dev *hdev)
 {
 	struct btmtk_hci_wmt_params wmt_params;
+	struct btusb_data *data = hci_get_drvdata(hdev);
 	u8 param = 0;
 	int err;
 
+	err = usb_autopm_get_interface(data->intf);
+	if (err < 0)
+		return err;
+
 	/* Disable the device */
 	wmt_params.op = BTMTK_WMT_FUNC_CTRL;
 	wmt_params.flag = 0;
@@ -2986,9 +2991,11 @@ static int btusb_mtk_shutdown(struct hci_dev *hdev)
 	err = btusb_mtk_hci_wmt_sync(hdev, &wmt_params);
 	if (err < 0) {
 		bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err);
+		usb_autopm_put_interface(data->intf);
 		return err;
 	}
 
+	usb_autopm_put_interface(data->intf);
 	return 0;
 }
 
-- 
2.18.0