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

!9829 fix CVE-2024-38620 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jialin Zhang <zhangjialin11@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4WV2O4ZFB4QQJOTBGZC75P5D3CQOFKBV/ 
Christophe JAILLET (1):
  Bluetooth: Remove usage of the deprecated ida_simple_xx() API

Iulia Tanasescu (1):
  Bluetooth: ISO: Fix BIS cleanup

Luiz Augusto von Dentz (1):
  Bluetooth: HCI: Remove HCI_AMP support

Lukas Bulwahn (1):
  Bluetooth: hci_event: Remove code to removed CONFIG_BT_HS

Pauli Virtanen (1):
  Bluetooth: fix connection setup in l2cap_connect


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/IA6ZJK 
 
Link:https://gitee.com/openeuler/kernel/pulls/9829

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 2cf566ed 4a3692a5

drivers/bluetooth/btmrvl_main.c

+0 −9
Original line number Diff line number Diff line
@@ -121,13 +121,6 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) 
				((event->data[2] == MODULE_BROUGHT_UP) ||

				(event->data[2] == MODULE_ALREADY_UP)) ?

				"Bring-up succeed" : "Bring-up failed");



			if (event->length > 3 && event->data[3])

				priv->btmrvl_dev.dev_type = HCI_AMP;

			else

				priv->btmrvl_dev.dev_type = HCI_PRIMARY;



			BT_DBG("dev_type: %d", priv->btmrvl_dev.dev_type);

		} else if (priv->btmrvl_dev.sendcmdflag &&

				event->data[1] == MODULE_SHUTDOWN_REQ) {

			BT_DBG("EVENT:%s", (event->data[2]) ?
@@ -686,8 +679,6 @@ int btmrvl_register_hdev(struct btmrvl_private *priv) 
	hdev->wakeup = btmrvl_wakeup;

	SET_HCIDEV_DEV(hdev, &card->func->dev);



	hdev->dev_type = priv->btmrvl_dev.dev_type;



	ret = hci_register_dev(hdev);

	if (ret < 0) {

		BT_ERR("Can not register HCI device");

drivers/bluetooth/btrsi.c

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ static int rsi_hci_attach(void *priv, struct rsi_proto_ops *ops) 
		hdev->bus = HCI_USB;



	hci_set_drvdata(hdev, h_adapter);

	hdev->dev_type = HCI_PRIMARY;

	hdev->open = rsi_hci_open;

	hdev->close = rsi_hci_close;

	hdev->flush = rsi_hci_flush;

drivers/bluetooth/btsdio.c

+0 −8
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ static const struct sdio_device_id btsdio_table[] = { 
	/* Generic Bluetooth Type-B SDIO device */

	{ SDIO_DEVICE_CLASS(SDIO_CLASS_BT_B) },



	/* Generic Bluetooth AMP controller */

	{ SDIO_DEVICE_CLASS(SDIO_CLASS_BT_AMP) },



	{ }	/* Terminating entry */

};
@@ -319,11 +316,6 @@ static int btsdio_probe(struct sdio_func *func, 
	hdev->bus = HCI_SDIO;

	hci_set_drvdata(hdev, data);



	if (id->class == SDIO_CLASS_BT_AMP)

		hdev->dev_type = HCI_AMP;

	else

		hdev->dev_type = HCI_PRIMARY;



	data->hdev = hdev;



	SET_HCIDEV_DEV(hdev, &func->dev);

drivers/bluetooth/btusb.c

+0 −5
Original line number Diff line number Diff line
@@ -4308,11 +4308,6 @@ static int btusb_probe(struct usb_interface *intf, 
	hdev->bus = HCI_USB;

	hci_set_drvdata(hdev, data);



	if (id->driver_info & BTUSB_AMP)

		hdev->dev_type = HCI_AMP;

	else

		hdev->dev_type = HCI_PRIMARY;



	data->hdev = hdev;



	SET_HCIDEV_DEV(hdev, &intf->dev);

drivers/bluetooth/hci_bcm4377.c

+0 −1
Original line number Diff line number Diff line
@@ -2361,7 +2361,6 @@ static int bcm4377_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	bcm4377->hdev = hdev;



	hdev->bus = HCI_PCI;

	hdev->dev_type = HCI_PRIMARY;

	hdev->open = bcm4377_hci_open;

	hdev->close = bcm4377_hci_close;

	hdev->send = bcm4377_hci_send_frame;