linux-kernel - [PATCH] Bluetooth: btrtl: Save firmware and config

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]

Date:   Fri, 2 Aug 2019 20:10:29 +0800
From:   Alex Lu <alex_lu@...lsil.com.cn>
To:     Marcel Holtmann <marcel@...tmann.org>
CC:     Johan Hedberg <johan.hedberg@...il.com>,
        <linux-bluetooth@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        Max Chou <max.chou@...ltek.com>
Subject: [PATCH] Bluetooth: btrtl: Save firmware and config

From: Alex Lu <alex_lu@...lsil.com.cn>

usb reset resume will cause downloading firmware again and
requesting firmware may be failed while host is resuming

Signed-off-by: Alex Lu <alex_lu@...lsil.com.cn>
---
 drivers/bluetooth/btrtl.c | 77 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 73 insertions(+), 4 deletions(-)

diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index 208feef63de4..69f0c2765443 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -56,6 +56,10 @@ struct btrtl_device_info {
 	int cfg_len;
 };
 
+static struct btrtl_device_info dev_info = {
+	NULL, 0, NULL, 0, NULL, 0
+};
+
 static const struct id_table ic_id_table[] = {
 	{ IC_MATCH_FL_LMPSUBV, RTL_ROM_LMP_8723A, 0x0,
 	  .config_needed = false,
@@ -553,8 +557,19 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
 			goto err_free;
 	}
 
-	btrtl_dev->fw_len = rtl_load_file(hdev, btrtl_dev->ic_info->fw_name,
-					  &btrtl_dev->fw_data);
+	if (dev_info.ic_info == NULL ||
+	    dev_info.ic_info != btrtl_dev->ic_info) {
+		btrtl_dev->fw_len = rtl_load_file(hdev,
+						  btrtl_dev->ic_info->fw_name,
+						  &btrtl_dev->fw_data);
+	} else {
+		if (dev_info.fw_len)
+			btrtl_dev->fw_data = kmemdup(dev_info.fw_data,
+						     dev_info.fw_len,
+						     GFP_KERNEL);
+		if (btrtl_dev->fw_data)
+			btrtl_dev->fw_len = dev_info.fw_len;
+	}
 	if (btrtl_dev->fw_len < 0) {
 		rtl_dev_err(hdev, "firmware file %s not found\n",
 			    btrtl_dev->ic_info->fw_name);
@@ -570,8 +585,18 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
 			snprintf(cfg_name, sizeof(cfg_name), "%s.bin",
 				 btrtl_dev->ic_info->cfg_name);
 		}
-		btrtl_dev->cfg_len = rtl_load_file(hdev, cfg_name,
-						   &btrtl_dev->cfg_data);
+		if (dev_info.ic_info == NULL ||
+		    dev_info.ic_info != btrtl_dev->ic_info) {
+			btrtl_dev->cfg_len = rtl_load_file(hdev, cfg_name,
+							&btrtl_dev->cfg_data);
+		} else {
+			if (dev_info.cfg_len)
+				btrtl_dev->cfg_data = kmemdup(dev_info.cfg_data,
+							      dev_info.cfg_len,
+							      GFP_KERNEL);
+			if (btrtl_dev->cfg_data)
+				btrtl_dev->cfg_len = dev_info.cfg_len;
+		}
 		if (btrtl_dev->ic_info->config_needed &&
 		    btrtl_dev->cfg_len <= 0) {
 			rtl_dev_err(hdev, "mandatory config file %s not found\n",
@@ -620,6 +645,29 @@ int btrtl_download_firmware(struct hci_dev *hdev,
 }
 EXPORT_SYMBOL_GPL(btrtl_download_firmware);
 
+static void dev_fw_free(void)
+{
+	kfree(dev_info.fw_data);
+	kfree(dev_info.cfg_data);
+	memset(&dev_info, 0, sizeof(dev_info));
+}
+
+static void dev_fw_dup(struct btrtl_device_info *btrtl_dev)
+{
+	dev_info.ic_info = btrtl_dev->ic_info;
+	dev_info.rom_version = btrtl_dev->rom_version;
+
+	dev_info.fw_len = btrtl_dev->fw_len;
+	if (dev_info.fw_len)
+		dev_info.fw_data = kmemdup(btrtl_dev->fw_data,
+					   btrtl_dev->fw_len,
+					   GFP_KERNEL);
+	dev_info.cfg_len = btrtl_dev->cfg_len;
+	if (dev_info.cfg_len)
+		dev_info.cfg_data = kmemdup(btrtl_dev->cfg_data,
+					    btrtl_dev->cfg_len, GFP_KERNEL);
+}
+
 int btrtl_setup_realtek(struct hci_dev *hdev)
 {
 	struct btrtl_device_info *btrtl_dev;
@@ -630,6 +678,10 @@ int btrtl_setup_realtek(struct hci_dev *hdev)
 		return PTR_ERR(btrtl_dev);
 
 	ret = btrtl_download_firmware(hdev, btrtl_dev);
+	if (!ret && btrtl_dev->ic_info != dev_info.ic_info) {
+		dev_fw_free();
+		dev_fw_dup(btrtl_dev);
+	}
 
 	btrtl_free(btrtl_dev);
 
@@ -745,6 +797,23 @@ int btrtl_get_uart_settings(struct hci_dev *hdev,
 }
 EXPORT_SYMBOL_GPL(btrtl_get_uart_settings);
 
+static int btrtl_module_init(void)
+{
+	BT_INFO("btrtl: init");
+
+	return 0;
+}
+
+static void btrtl_module_exit(void)
+{
+	BT_INFO("btrtl: exit");
+
+	dev_fw_free();
+}
+
+module_init(btrtl_module_init);
+module_exit(btrtl_module_exit)
+
 MODULE_AUTHOR("Daniel Drake <drake@...lessm.com>");
 MODULE_DESCRIPTION("Bluetooth support for Realtek devices ver " VERSION);
 MODULE_VERSION(VERSION);
-- 
2.19.2