From 46acc2e81819c0b9389186067305c3ba8e13b270 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 8 Aug 2022 15:57:33 +0200 Subject: [PATCH] 5.10-stable patches added patches: bluetooth-btusb-add-realtek-rtl8852c-support-id-0x04c5-0x1675.patch bluetooth-btusb-add-realtek-rtl8852c-support-id-0x04ca-0x4007.patch bluetooth-btusb-add-realtek-rtl8852c-support-id-0x0cb8-0xc558.patch bluetooth-btusb-add-realtek-rtl8852c-support-id-0x13d3-0x3586.patch bluetooth-btusb-add-realtek-rtl8852c-support-id-0x13d3-0x3587.patch bluetooth-btusb-add-support-of-imc-networks-pid-0x3568.patch bluetooth-hci_bcm-add-bcm4349b1-variant.patch bluetooth-hci_bcm-add-dt-compatible-for-cyw55572.patch macintosh-adb-fix-oob-read-in-do_adb_query-function.patch --- ...ek-rtl8852c-support-id-0x04c5-0x1675.patch | 62 ++++++++++++++++++ ...ek-rtl8852c-support-id-0x04ca-0x4007.patch | 64 +++++++++++++++++++ ...ek-rtl8852c-support-id-0x0cb8-0xc558.patch | 62 ++++++++++++++++++ ...ek-rtl8852c-support-id-0x13d3-0x3586.patch | 62 ++++++++++++++++++ ...ek-rtl8852c-support-id-0x13d3-0x3587.patch | 62 ++++++++++++++++++ ...d-support-of-imc-networks-pid-0x3568.patch | 48 ++++++++++++++ ...etooth-hci_bcm-add-bcm4349b1-variant.patch | 47 ++++++++++++++ ...i_bcm-add-dt-compatible-for-cyw55572.patch | 29 +++++++++ ...ix-oob-read-in-do_adb_query-function.patch | 37 +++++++++++ queue-5.10/series | 9 +++ 10 files changed, 482 insertions(+) create mode 100644 queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x04c5-0x1675.patch create mode 100644 queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x04ca-0x4007.patch create mode 100644 queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x0cb8-0xc558.patch create mode 100644 queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x13d3-0x3586.patch create mode 100644 queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x13d3-0x3587.patch create mode 100644 queue-5.10/bluetooth-btusb-add-support-of-imc-networks-pid-0x3568.patch create mode 100644 queue-5.10/bluetooth-hci_bcm-add-bcm4349b1-variant.patch create mode 100644 queue-5.10/bluetooth-hci_bcm-add-dt-compatible-for-cyw55572.patch create mode 100644 queue-5.10/macintosh-adb-fix-oob-read-in-do_adb_query-function.patch diff --git a/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x04c5-0x1675.patch b/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x04c5-0x1675.patch new file mode 100644 index 00000000000..0f262e16c07 --- /dev/null +++ b/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x04c5-0x1675.patch @@ -0,0 +1,62 @@ +From 893fa8bc9952a36fb682ee12f0a994b5817a36d2 Mon Sep 17 00:00:00 2001 +From: Hilda Wu +Date: Thu, 14 Jul 2022 19:25:20 +0800 +Subject: Bluetooth: btusb: Add Realtek RTL8852C support ID 0x04C5:0x1675 + +From: Hilda Wu + +commit 893fa8bc9952a36fb682ee12f0a994b5817a36d2 upstream. + +Add the support ID(0x04c5, 0x1675) to usb_device_id table for +Realtek RTL8852C. + +The device info from /sys/kernel/debug/usb/devices as below. + +T: Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 +D: Ver= 1.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=04c5 ProdID=1675 Rev= 0.00 +S: Manufacturer=Realtek +S: Product=Bluetooth Radio +S: SerialNumber=00e04c000001 +C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA +I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms +I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms +I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms +I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms +I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms +I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms + +Signed-off-by: Hilda Wu +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bluetooth/btusb.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -402,6 +402,8 @@ static const struct usb_device_id blackl + /* Realtek 8852CE Bluetooth devices */ + { USB_DEVICE(0x04ca, 0x4007), .driver_info = BTUSB_REALTEK | + BTUSB_WIDEBAND_SPEECH }, ++ { USB_DEVICE(0x04c5, 0x1675), .driver_info = BTUSB_REALTEK | ++ BTUSB_WIDEBAND_SPEECH }, + + /* Realtek Bluetooth devices */ + { USB_VENDOR_AND_INTERFACE_INFO(0x0bda, 0xe0, 0x01, 0x01), diff --git a/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x04ca-0x4007.patch b/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x04ca-0x4007.patch new file mode 100644 index 00000000000..33657f8da05 --- /dev/null +++ b/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x04ca-0x4007.patch @@ -0,0 +1,64 @@ +From c379c96cc221767af9688a5d4758a78eea30883a Mon Sep 17 00:00:00 2001 +From: Hilda Wu +Date: Thu, 14 Jul 2022 19:25:19 +0800 +Subject: Bluetooth: btusb: Add Realtek RTL8852C support ID 0x04CA:0x4007 + +From: Hilda Wu + +commit c379c96cc221767af9688a5d4758a78eea30883a upstream. + +Add the support ID(0x04CA, 0x4007) to usb_device_id table for +Realtek RTL8852C. + +The device info from /sys/kernel/debug/usb/devices as below. + +T: Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 +D: Ver= 1.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=04ca ProdID=4007 Rev= 0.00 +S: Manufacturer=Realtek +S: Product=Bluetooth Radio +S: SerialNumber=00e04c000001 +C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA +I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms +I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms +I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms +I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms +I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms +I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms + +Signed-off-by: Hilda Wu +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bluetooth/btusb.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -399,6 +399,10 @@ static const struct usb_device_id blackl + { USB_DEVICE(0x0bda, 0xc822), .driver_info = BTUSB_REALTEK | + BTUSB_WIDEBAND_SPEECH }, + ++ /* Realtek 8852CE Bluetooth devices */ ++ { USB_DEVICE(0x04ca, 0x4007), .driver_info = BTUSB_REALTEK | ++ BTUSB_WIDEBAND_SPEECH }, ++ + /* Realtek Bluetooth devices */ + { USB_VENDOR_AND_INTERFACE_INFO(0x0bda, 0xe0, 0x01, 0x01), + .driver_info = BTUSB_REALTEK }, diff --git a/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x0cb8-0xc558.patch b/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x0cb8-0xc558.patch new file mode 100644 index 00000000000..56fc110587a --- /dev/null +++ b/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x0cb8-0xc558.patch @@ -0,0 +1,62 @@ +From 5b75ee37ebb73f58468d4cca172434324af203f1 Mon Sep 17 00:00:00 2001 +From: Hilda Wu +Date: Thu, 14 Jul 2022 19:25:21 +0800 +Subject: Bluetooth: btusb: Add Realtek RTL8852C support ID 0x0CB8:0xC558 + +From: Hilda Wu + +commit 5b75ee37ebb73f58468d4cca172434324af203f1 upstream. + +Add the support ID(0x0CB8, 0xC558) to usb_device_id table for +Realtek RTL8852C. + +The device info from /sys/kernel/debug/usb/devices as below. + +T: Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 +D: Ver= 1.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=0cb8 ProdID=c558 Rev= 0.00 +S: Manufacturer=Realtek +S: Product=Bluetooth Radio +S: SerialNumber=00e04c000001 +C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA +I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms +I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms +I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms +I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms +I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms +I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms + +Signed-off-by: Hilda Wu +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bluetooth/btusb.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -404,6 +404,8 @@ static const struct usb_device_id blackl + BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x04c5, 0x1675), .driver_info = BTUSB_REALTEK | + BTUSB_WIDEBAND_SPEECH }, ++ { USB_DEVICE(0x0cb8, 0xc558), .driver_info = BTUSB_REALTEK | ++ BTUSB_WIDEBAND_SPEECH }, + + /* Realtek Bluetooth devices */ + { USB_VENDOR_AND_INTERFACE_INFO(0x0bda, 0xe0, 0x01, 0x01), diff --git a/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x13d3-0x3586.patch b/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x13d3-0x3586.patch new file mode 100644 index 00000000000..5503f60e1e4 --- /dev/null +++ b/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x13d3-0x3586.patch @@ -0,0 +1,62 @@ +From 6ad353dfc8ee3230a5e123c21da50f1b64cc4b39 Mon Sep 17 00:00:00 2001 +From: Hilda Wu +Date: Thu, 14 Jul 2022 19:25:23 +0800 +Subject: Bluetooth: btusb: Add Realtek RTL8852C support ID 0x13D3:0x3586 + +From: Hilda Wu + +commit 6ad353dfc8ee3230a5e123c21da50f1b64cc4b39 upstream. + +Add the support ID(0x13D3, 0x3586) to usb_device_id table for +Realtek RTL8852C. + +The device info from /sys/kernel/debug/usb/devices as below. + +T: Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 +D: Ver= 1.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=13d3 ProdID=3586 Rev= 0.00 +S: Manufacturer=Realtek +S: Product=Bluetooth Radio +S: SerialNumber=00e04c000001 +C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA +I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms +I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms +I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms +I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms +I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms +I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms + +Signed-off-by: Hilda Wu +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bluetooth/btusb.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -408,6 +408,8 @@ static const struct usb_device_id blackl + BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x13d3, 0x3587), .driver_info = BTUSB_REALTEK | + BTUSB_WIDEBAND_SPEECH }, ++ { USB_DEVICE(0x13d3, 0x3586), .driver_info = BTUSB_REALTEK | ++ BTUSB_WIDEBAND_SPEECH }, + + /* Realtek Bluetooth devices */ + { USB_VENDOR_AND_INTERFACE_INFO(0x0bda, 0xe0, 0x01, 0x01), diff --git a/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x13d3-0x3587.patch b/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x13d3-0x3587.patch new file mode 100644 index 00000000000..c58767c7995 --- /dev/null +++ b/queue-5.10/bluetooth-btusb-add-realtek-rtl8852c-support-id-0x13d3-0x3587.patch @@ -0,0 +1,62 @@ +From 8f0054dd29373cd877db87751c143610561d549d Mon Sep 17 00:00:00 2001 +From: Hilda Wu +Date: Thu, 14 Jul 2022 19:25:22 +0800 +Subject: Bluetooth: btusb: Add Realtek RTL8852C support ID 0x13D3:0x3587 + +From: Hilda Wu + +commit 8f0054dd29373cd877db87751c143610561d549d upstream. + +Add the support ID(0x13D3, 0x3587) to usb_device_id table for +Realtek RTL8852C. + +The device info from /sys/kernel/debug/usb/devices as below. + +T: Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 +D: Ver= 1.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=13d3 ProdID=3587 Rev= 0.00 +S: Manufacturer=Realtek +S: Product=Bluetooth Radio +S: SerialNumber=00e04c000001 +C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA +I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms +I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms +I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms +I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms +I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms +I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms + +Signed-off-by: Hilda Wu +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bluetooth/btusb.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -406,6 +406,8 @@ static const struct usb_device_id blackl + BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x0cb8, 0xc558), .driver_info = BTUSB_REALTEK | + BTUSB_WIDEBAND_SPEECH }, ++ { USB_DEVICE(0x13d3, 0x3587), .driver_info = BTUSB_REALTEK | ++ BTUSB_WIDEBAND_SPEECH }, + + /* Realtek Bluetooth devices */ + { USB_VENDOR_AND_INTERFACE_INFO(0x0bda, 0xe0, 0x01, 0x01), diff --git a/queue-5.10/bluetooth-btusb-add-support-of-imc-networks-pid-0x3568.patch b/queue-5.10/bluetooth-btusb-add-support-of-imc-networks-pid-0x3568.patch new file mode 100644 index 00000000000..9aa311e0565 --- /dev/null +++ b/queue-5.10/bluetooth-btusb-add-support-of-imc-networks-pid-0x3568.patch @@ -0,0 +1,48 @@ +From c69ecb0ea4c96b8b191cbaa0b420222a37867655 Mon Sep 17 00:00:00 2001 +From: Aaron Ma +Date: Thu, 2 Jun 2022 17:28:22 +0800 +Subject: Bluetooth: btusb: Add support of IMC Networks PID 0x3568 + +From: Aaron Ma + +commit c69ecb0ea4c96b8b191cbaa0b420222a37867655 upstream. + +It is 13d3:3568 for MediaTek MT7922 USB Bluetooth chip. + +T: Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 2 Spd=480 MxCh= 0 +D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=13d3 ProdID=3568 Rev=01.00 +S: Manufacturer=MediaTek Inc. +S: Product=Wireless_Device +S: SerialNumber=... +C: #Ifs= 3 Cfg#= 1 Atr=e0 MxPwr=100mA +I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=125us +E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms +I: If#= 2 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=(none) +E: Ad=0a(O) Atr=03(Int.) MxPS= 64 Ivl=125us +E: Ad=8a(I) Atr=03(Int.) MxPS= 64 Ivl=125us + +Signed-off-by: Aaron Ma +Signed-off-by: Marcel Holtmann +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bluetooth/btusb.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -416,6 +416,9 @@ static const struct usb_device_id blackl + { USB_DEVICE(0x0489, 0xe0d9), .driver_info = BTUSB_MEDIATEK | + BTUSB_WIDEBAND_SPEECH | + BTUSB_VALID_LE_STATES }, ++ { USB_DEVICE(0x13d3, 0x3568), .driver_info = BTUSB_MEDIATEK | ++ BTUSB_WIDEBAND_SPEECH | ++ BTUSB_VALID_LE_STATES }, + + /* Additional Realtek 8723AE Bluetooth devices */ + { USB_DEVICE(0x0930, 0x021d), .driver_info = BTUSB_REALTEK }, diff --git a/queue-5.10/bluetooth-hci_bcm-add-bcm4349b1-variant.patch b/queue-5.10/bluetooth-hci_bcm-add-bcm4349b1-variant.patch new file mode 100644 index 00000000000..2eb516866cf --- /dev/null +++ b/queue-5.10/bluetooth-hci_bcm-add-bcm4349b1-variant.patch @@ -0,0 +1,47 @@ +From 4f17c2b6694d0c4098f33b07ee3a696976940aa5 Mon Sep 17 00:00:00 2001 +From: Ahmad Fatoum +Date: Tue, 24 May 2022 07:56:41 +0200 +Subject: Bluetooth: hci_bcm: Add BCM4349B1 variant + +From: Ahmad Fatoum + +commit 4f17c2b6694d0c4098f33b07ee3a696976940aa5 upstream. + +The BCM4349B1, aka CYW/BCM89359, is a WiFi+BT chip and its Bluetooth +portion can be controlled over serial. + +Two subversions are added for the chip, because ROM firmware reports +002.002.013 (at least for the chips I have here), while depending on +patchram firmware revision, either 002.002.013 or 002.002.014 is +reported. + +Signed-off-by: Ahmad Fatoum +Reviewed-by: Linus Walleij +Signed-off-by: Marcel Holtmann +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bluetooth/btbcm.c | 2 ++ + drivers/bluetooth/hci_bcm.c | 1 + + 2 files changed, 3 insertions(+) + +--- a/drivers/bluetooth/btbcm.c ++++ b/drivers/bluetooth/btbcm.c +@@ -401,6 +401,8 @@ static const struct bcm_subver_table bcm + { 0x6606, "BCM4345C5" }, /* 003.006.006 */ + { 0x230f, "BCM4356A2" }, /* 001.003.015 */ + { 0x220e, "BCM20702A1" }, /* 001.002.014 */ ++ { 0x420d, "BCM4349B1" }, /* 002.002.013 */ ++ { 0x420e, "BCM4349B1" }, /* 002.002.014 */ + { 0x4217, "BCM4329B1" }, /* 002.002.023 */ + { 0x6106, "BCM4359C0" }, /* 003.001.006 */ + { 0x4106, "BCM4335A0" }, /* 002.001.006 */ +--- a/drivers/bluetooth/hci_bcm.c ++++ b/drivers/bluetooth/hci_bcm.c +@@ -1489,6 +1489,7 @@ static const struct of_device_id bcm_blu + { .compatible = "brcm,bcm4345c5" }, + { .compatible = "brcm,bcm4330-bt" }, + { .compatible = "brcm,bcm43438-bt", .data = &bcm43438_device_data }, ++ { .compatible = "brcm,bcm4349-bt", .data = &bcm43438_device_data }, + { .compatible = "brcm,bcm43540-bt", .data = &bcm4354_device_data }, + { .compatible = "brcm,bcm4335a0" }, + { }, diff --git a/queue-5.10/bluetooth-hci_bcm-add-dt-compatible-for-cyw55572.patch b/queue-5.10/bluetooth-hci_bcm-add-dt-compatible-for-cyw55572.patch new file mode 100644 index 00000000000..2d7c6488b6c --- /dev/null +++ b/queue-5.10/bluetooth-hci_bcm-add-dt-compatible-for-cyw55572.patch @@ -0,0 +1,29 @@ +From f8cad62002a7699fd05a23b558b980b5a77defe0 Mon Sep 17 00:00:00 2001 +From: Hakan Jansson +Date: Thu, 30 Jun 2022 14:45:22 +0200 +Subject: Bluetooth: hci_bcm: Add DT compatible for CYW55572 + +From: Hakan Jansson + +commit f8cad62002a7699fd05a23b558b980b5a77defe0 upstream. + +CYW55572 is a Wi-Fi + Bluetooth combo device from Infineon. + +Signed-off-by: Hakan Jansson +Reviewed-by: Linus Walleij +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bluetooth/hci_bcm.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/bluetooth/hci_bcm.c ++++ b/drivers/bluetooth/hci_bcm.c +@@ -1492,6 +1492,7 @@ static const struct of_device_id bcm_blu + { .compatible = "brcm,bcm4349-bt", .data = &bcm43438_device_data }, + { .compatible = "brcm,bcm43540-bt", .data = &bcm4354_device_data }, + { .compatible = "brcm,bcm4335a0" }, ++ { .compatible = "infineon,cyw55572-bt" }, + { }, + }; + MODULE_DEVICE_TABLE(of, bcm_bluetooth_of_match); diff --git a/queue-5.10/macintosh-adb-fix-oob-read-in-do_adb_query-function.patch b/queue-5.10/macintosh-adb-fix-oob-read-in-do_adb_query-function.patch new file mode 100644 index 00000000000..8870d24ea97 --- /dev/null +++ b/queue-5.10/macintosh-adb-fix-oob-read-in-do_adb_query-function.patch @@ -0,0 +1,37 @@ +From fd97e4ad6d3b0c9fce3bca8ea8e6969d9ce7423b Mon Sep 17 00:00:00 2001 +From: Ning Qiang +Date: Wed, 13 Jul 2022 23:37:34 +0800 +Subject: macintosh/adb: fix oob read in do_adb_query() function + +From: Ning Qiang + +commit fd97e4ad6d3b0c9fce3bca8ea8e6969d9ce7423b upstream. + +In do_adb_query() function of drivers/macintosh/adb.c, req->data is copied +form userland. The parameter "req->data[2]" is missing check, the array +size of adb_handler[] is 16, so adb_handler[req->data[2]].original_address and +adb_handler[req->data[2]].handler_id will lead to oob read. + +Cc: stable +Signed-off-by: Ning Qiang +Reviewed-by: Kees Cook +Reviewed-by: Greg Kroah-Hartman +Acked-by: Benjamin Herrenschmidt +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20220713153734.2248-1-sohu0106@126.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/macintosh/adb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/macintosh/adb.c ++++ b/drivers/macintosh/adb.c +@@ -647,7 +647,7 @@ do_adb_query(struct adb_request *req) + + switch(req->data[1]) { + case ADB_QUERY_GETDEVINFO: +- if (req->nbytes < 3) ++ if (req->nbytes < 3 || req->data[2] >= 16) + break; + mutex_lock(&adb_handler_mutex); + req->reply[0] = adb_handler[req->data[2]].original_address; diff --git a/queue-5.10/series b/queue-5.10/series index 00bc89637c2..d77e700430d 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -10,3 +10,12 @@ acpi-apei-better-fix-to-avoid-spamming-the-console-with-old-error-logs.patch crypto-arm64-poly1305-fix-a-read-out-of-bound.patch tools-kvm_stat-fix-display-of-error-when-multiple-pr.patch selftests-kvm-handle-compiler-optimizations-in-ucall.patch +bluetooth-hci_bcm-add-bcm4349b1-variant.patch +bluetooth-hci_bcm-add-dt-compatible-for-cyw55572.patch +bluetooth-btusb-add-support-of-imc-networks-pid-0x3568.patch +bluetooth-btusb-add-realtek-rtl8852c-support-id-0x04ca-0x4007.patch +bluetooth-btusb-add-realtek-rtl8852c-support-id-0x04c5-0x1675.patch +bluetooth-btusb-add-realtek-rtl8852c-support-id-0x0cb8-0xc558.patch +bluetooth-btusb-add-realtek-rtl8852c-support-id-0x13d3-0x3587.patch +bluetooth-btusb-add-realtek-rtl8852c-support-id-0x13d3-0x3586.patch +macintosh-adb-fix-oob-read-in-do_adb_query-function.patch -- 2.47.3