From: Greg Kroah-Hartman Date: Thu, 28 Dec 2023 11:08:22 +0000 (+0000) Subject: 5.15-stable patches X-Git-Tag: v6.1.70~31 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=881ba76b2364ab2df32a96ed72f39d6d73d4c9f2;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: bluetooth-hci_event-fix-not-checking-if-hci_op_inquiry-has-been-sent.patch bluetooth-l2cap-send-reject-on-command-corrupted-request.patch bluetooth-mgmt-smp-fix-address-type-when-using-smp-over-bredr-le.patch usb-serial-ftdi_sio-update-actisense-pids-constant-names.patch usb-serial-option-add-foxconn-t99w265-with-new-baseline.patch usb-serial-option-add-quectel-eg912y-module-support.patch usb-serial-option-add-quectel-rm500q-r13-firmware-support.patch wifi-cfg80211-add-my-certificate.patch wifi-cfg80211-fix-certs-build-to-not-depend-on-file-order.patch --- diff --git a/queue-5.15/bluetooth-hci_event-fix-not-checking-if-hci_op_inquiry-has-been-sent.patch b/queue-5.15/bluetooth-hci_event-fix-not-checking-if-hci_op_inquiry-has-been-sent.patch new file mode 100644 index 00000000000..b3910fbd024 --- /dev/null +++ b/queue-5.15/bluetooth-hci_event-fix-not-checking-if-hci_op_inquiry-has-been-sent.patch @@ -0,0 +1,34 @@ +From 99e67d46e5ff3c7c901af6009edec72d3d363be8 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Mon, 20 Nov 2023 10:04:39 -0500 +Subject: Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent + +From: Luiz Augusto von Dentz + +commit 99e67d46e5ff3c7c901af6009edec72d3d363be8 upstream. + +Before setting HCI_INQUIRY bit check if HCI_OP_INQUIRY was really sent +otherwise the controller maybe be generating invalid events or, more +likely, it is a result of fuzzing tools attempting to test the right +behavior of the stack when unexpected events are generated. + +Cc: stable@vger.kernel.org +Link: https://bugzilla.kernel.org/show_bug.cgi?id=218151 +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Greg Kroah-Hartman +--- + net/bluetooth/hci_event.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/net/bluetooth/hci_event.c ++++ b/net/bluetooth/hci_event.c +@@ -1926,7 +1926,8 @@ static void hci_cs_inquiry(struct hci_de + return; + } + +- set_bit(HCI_INQUIRY, &hdev->flags); ++ if (hci_sent_cmd_data(hdev, HCI_OP_INQUIRY)) ++ set_bit(HCI_INQUIRY, &hdev->flags); + } + + static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status) diff --git a/queue-5.15/bluetooth-l2cap-send-reject-on-command-corrupted-request.patch b/queue-5.15/bluetooth-l2cap-send-reject-on-command-corrupted-request.patch new file mode 100644 index 00000000000..157ddda37fd --- /dev/null +++ b/queue-5.15/bluetooth-l2cap-send-reject-on-command-corrupted-request.patch @@ -0,0 +1,73 @@ +From 78b99eb1faa7371bf9c534690f26a71b6996622d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= +Date: Fri, 8 Dec 2023 18:41:50 +0100 +Subject: Bluetooth: L2CAP: Send reject on command corrupted request +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Frédéric Danis + +commit 78b99eb1faa7371bf9c534690f26a71b6996622d upstream. + +L2CAP/COS/CED/BI-02-C PTS test send a malformed L2CAP signaling packet +with 2 commands in it (a connection request and an unknown command) and +expect to get a connection response packet and a command reject packet. +The second is currently not sent. + +Cc: stable@vger.kernel.org +Signed-off-by: Frédéric Danis +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Greg Kroah-Hartman +--- + net/bluetooth/l2cap_core.c | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +--- a/net/bluetooth/l2cap_core.c ++++ b/net/bluetooth/l2cap_core.c +@@ -6493,6 +6493,14 @@ drop: + kfree_skb(skb); + } + ++static inline void l2cap_sig_send_rej(struct l2cap_conn *conn, u16 ident) ++{ ++ struct l2cap_cmd_rej_unk rej; ++ ++ rej.reason = cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD); ++ l2cap_send_cmd(conn, ident, L2CAP_COMMAND_REJ, sizeof(rej), &rej); ++} ++ + static inline void l2cap_sig_channel(struct l2cap_conn *conn, + struct sk_buff *skb) + { +@@ -6518,23 +6526,24 @@ static inline void l2cap_sig_channel(str + + if (len > skb->len || !cmd->ident) { + BT_DBG("corrupted command"); ++ l2cap_sig_send_rej(conn, cmd->ident); + break; + } + + err = l2cap_bredr_sig_cmd(conn, cmd, len, skb->data); + if (err) { +- struct l2cap_cmd_rej_unk rej; +- + BT_ERR("Wrong link type (%d)", err); +- +- rej.reason = cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD); +- l2cap_send_cmd(conn, cmd->ident, L2CAP_COMMAND_REJ, +- sizeof(rej), &rej); ++ l2cap_sig_send_rej(conn, cmd->ident); + } + + skb_pull(skb, len); + } + ++ if (skb->len > 0) { ++ BT_DBG("corrupted command"); ++ l2cap_sig_send_rej(conn, 0); ++ } ++ + drop: + kfree_skb(skb); + } diff --git a/queue-5.15/bluetooth-mgmt-smp-fix-address-type-when-using-smp-over-bredr-le.patch b/queue-5.15/bluetooth-mgmt-smp-fix-address-type-when-using-smp-over-bredr-le.patch new file mode 100644 index 00000000000..145b1e0f58f --- /dev/null +++ b/queue-5.15/bluetooth-mgmt-smp-fix-address-type-when-using-smp-over-bredr-le.patch @@ -0,0 +1,256 @@ +From 59b047bc98084f8af2c41483e4d68a5adf2fa7f7 Mon Sep 17 00:00:00 2001 +From: Xiao Yao +Date: Tue, 12 Dec 2023 00:27:18 +0800 +Subject: Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE + +From: Xiao Yao + +commit 59b047bc98084f8af2c41483e4d68a5adf2fa7f7 upstream. + +If two Bluetooth devices both support BR/EDR and BLE, and also +support Secure Connections, then they only need to pair once. +The LTK generated during the LE pairing process may be converted +into a BR/EDR link key for BR/EDR transport, and conversely, a +link key generated during the BR/EDR SSP pairing process can be +converted into an LTK for LE transport. Hence, the link type of +the link key and LTK is not fixed, they can be either an LE LINK +or an ACL LINK. + +Currently, in the mgmt_new_irk/ltk/crsk/link_key functions, the +link type is fixed, which could lead to incorrect address types +being reported to the application layer. Therefore, it is necessary +to add link_type/addr_type to the smp_irk/ltk/crsk and link_key, +to ensure the generation of the correct address type. + +SMP over BREDR: +Before Fix: +> ACL Data RX: Handle 11 flags 0x02 dlen 12 + BR/EDR SMP: Identity Address Information (0x09) len 7 + Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76) +@ MGMT Event: New Identity Resolving Key (0x0018) plen 30 + Random address: 00:00:00:00:00:00 (Non-Resolvable) + LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76) +@ MGMT Event: New Long Term Key (0x000a) plen 37 + LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76) + Key type: Authenticated key from P-256 (0x03) + +After Fix: +> ACL Data RX: Handle 11 flags 0x02 dlen 12 + BR/EDR SMP: Identity Address Information (0x09) len 7 + Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76) +@ MGMT Event: New Identity Resolving Key (0x0018) plen 30 + Random address: 00:00:00:00:00:00 (Non-Resolvable) + BR/EDR Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76) +@ MGMT Event: New Long Term Key (0x000a) plen 37 + BR/EDR Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76) + Key type: Authenticated key from P-256 (0x03) + +SMP over LE: +Before Fix: +@ MGMT Event: New Identity Resolving Key (0x0018) plen 30 + Random address: 5F:5C:07:37:47:D5 (Resolvable) + LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76) +@ MGMT Event: New Long Term Key (0x000a) plen 37 + LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76) + Key type: Authenticated key from P-256 (0x03) +@ MGMT Event: New Link Key (0x0009) plen 26 + BR/EDR Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76) + Key type: Authenticated Combination key from P-256 (0x08) + +After Fix: +@ MGMT Event: New Identity Resolving Key (0x0018) plen 30 + Random address: 5E:03:1C:00:38:21 (Resolvable) + LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76) +@ MGMT Event: New Long Term Key (0x000a) plen 37 + LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76) + Key type: Authenticated key from P-256 (0x03) +@ MGMT Event: New Link Key (0x0009) plen 26 + Store hint: Yes (0x01) + LE Address: F8:7D:76:F2:12:F3 (OUI F8-7D-76) + Key type: Authenticated Combination key from P-256 (0x08) + +Cc: stable@vger.kernel.org +Signed-off-by: Xiao Yao +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Greg Kroah-Hartman +--- + include/net/bluetooth/hci_core.h | 5 +++++ + net/bluetooth/mgmt.c | 25 ++++++++++++++++++------- + net/bluetooth/smp.c | 7 +++++++ + 3 files changed, 30 insertions(+), 7 deletions(-) + +--- a/include/net/bluetooth/hci_core.h ++++ b/include/net/bluetooth/hci_core.h +@@ -176,6 +176,7 @@ struct blocked_key { + struct smp_csrk { + bdaddr_t bdaddr; + u8 bdaddr_type; ++ u8 link_type; + u8 type; + u8 val[16]; + }; +@@ -185,6 +186,7 @@ struct smp_ltk { + struct rcu_head rcu; + bdaddr_t bdaddr; + u8 bdaddr_type; ++ u8 link_type; + u8 authenticated; + u8 type; + u8 enc_size; +@@ -199,6 +201,7 @@ struct smp_irk { + bdaddr_t rpa; + bdaddr_t bdaddr; + u8 addr_type; ++ u8 link_type; + u8 val[16]; + }; + +@@ -206,6 +209,8 @@ struct link_key { + struct list_head list; + struct rcu_head rcu; + bdaddr_t bdaddr; ++ u8 bdaddr_type; ++ u8 link_type; + u8 type; + u8 val[HCI_LINK_KEY_SIZE]; + u8 pin_len; +--- a/net/bluetooth/mgmt.c ++++ b/net/bluetooth/mgmt.c +@@ -2378,7 +2378,8 @@ static int load_link_keys(struct sock *s + for (i = 0; i < key_count; i++) { + struct mgmt_link_key_info *key = &cp->keys[i]; + +- if (key->addr.type != BDADDR_BREDR || key->type > 0x08) ++ /* Considering SMP over BREDR/LE, there is no need to check addr_type */ ++ if (key->type > 0x08) + return mgmt_cmd_status(sk, hdev->id, + MGMT_OP_LOAD_LINK_KEYS, + MGMT_STATUS_INVALID_PARAMS); +@@ -6180,6 +6181,7 @@ static int load_irks(struct sock *sk, st + + for (i = 0; i < irk_count; i++) { + struct mgmt_irk_info *irk = &cp->irks[i]; ++ u8 addr_type = le_addr_type(irk->addr.type); + + if (hci_is_blocked_key(hdev, + HCI_BLOCKED_KEY_TYPE_IRK, +@@ -6189,8 +6191,12 @@ static int load_irks(struct sock *sk, st + continue; + } + ++ /* When using SMP over BR/EDR, the addr type should be set to BREDR */ ++ if (irk->addr.type == BDADDR_BREDR) ++ addr_type = BDADDR_BREDR; ++ + hci_add_irk(hdev, &irk->addr.bdaddr, +- le_addr_type(irk->addr.type), irk->val, ++ addr_type, irk->val, + BDADDR_ANY); + } + +@@ -6271,6 +6277,7 @@ static int load_long_term_keys(struct so + for (i = 0; i < key_count; i++) { + struct mgmt_ltk_info *key = &cp->keys[i]; + u8 type, authenticated; ++ u8 addr_type = le_addr_type(key->addr.type); + + if (hci_is_blocked_key(hdev, + HCI_BLOCKED_KEY_TYPE_LTK, +@@ -6305,8 +6312,12 @@ static int load_long_term_keys(struct so + continue; + } + ++ /* When using SMP over BR/EDR, the addr type should be set to BREDR */ ++ if (key->addr.type == BDADDR_BREDR) ++ addr_type = BDADDR_BREDR; ++ + hci_add_ltk(hdev, &key->addr.bdaddr, +- le_addr_type(key->addr.type), type, authenticated, ++ addr_type, type, authenticated, + key->val, key->enc_size, key->ediv, key->rand); + } + +@@ -8673,7 +8684,7 @@ void mgmt_new_link_key(struct hci_dev *h + + ev.store_hint = persistent; + bacpy(&ev.key.addr.bdaddr, &key->bdaddr); +- ev.key.addr.type = BDADDR_BREDR; ++ ev.key.addr.type = link_to_bdaddr(key->link_type, key->bdaddr_type); + ev.key.type = key->type; + memcpy(ev.key.val, key->val, HCI_LINK_KEY_SIZE); + ev.key.pin_len = key->pin_len; +@@ -8724,7 +8735,7 @@ void mgmt_new_ltk(struct hci_dev *hdev, + ev.store_hint = persistent; + + bacpy(&ev.key.addr.bdaddr, &key->bdaddr); +- ev.key.addr.type = link_to_bdaddr(LE_LINK, key->bdaddr_type); ++ ev.key.addr.type = link_to_bdaddr(key->link_type, key->bdaddr_type); + ev.key.type = mgmt_ltk_type(key); + ev.key.enc_size = key->enc_size; + ev.key.ediv = key->ediv; +@@ -8753,7 +8764,7 @@ void mgmt_new_irk(struct hci_dev *hdev, + + bacpy(&ev.rpa, &irk->rpa); + bacpy(&ev.irk.addr.bdaddr, &irk->bdaddr); +- ev.irk.addr.type = link_to_bdaddr(LE_LINK, irk->addr_type); ++ ev.irk.addr.type = link_to_bdaddr(irk->link_type, irk->addr_type); + memcpy(ev.irk.val, irk->val, sizeof(irk->val)); + + mgmt_event(MGMT_EV_NEW_IRK, hdev, &ev, sizeof(ev), NULL); +@@ -8782,7 +8793,7 @@ void mgmt_new_csrk(struct hci_dev *hdev, + ev.store_hint = persistent; + + bacpy(&ev.key.addr.bdaddr, &csrk->bdaddr); +- ev.key.addr.type = link_to_bdaddr(LE_LINK, csrk->bdaddr_type); ++ ev.key.addr.type = link_to_bdaddr(csrk->link_type, csrk->bdaddr_type); + ev.key.type = csrk->type; + memcpy(ev.key.val, csrk->val, sizeof(csrk->val)); + +--- a/net/bluetooth/smp.c ++++ b/net/bluetooth/smp.c +@@ -1058,6 +1058,7 @@ static void smp_notify_keys(struct l2cap + } + + if (smp->remote_irk) { ++ smp->remote_irk->link_type = hcon->type; + mgmt_new_irk(hdev, smp->remote_irk, persistent); + + /* Now that user space can be considered to know the +@@ -1072,24 +1073,28 @@ static void smp_notify_keys(struct l2cap + } + + if (smp->csrk) { ++ smp->csrk->link_type = hcon->type; + smp->csrk->bdaddr_type = hcon->dst_type; + bacpy(&smp->csrk->bdaddr, &hcon->dst); + mgmt_new_csrk(hdev, smp->csrk, persistent); + } + + if (smp->responder_csrk) { ++ smp->responder_csrk->link_type = hcon->type; + smp->responder_csrk->bdaddr_type = hcon->dst_type; + bacpy(&smp->responder_csrk->bdaddr, &hcon->dst); + mgmt_new_csrk(hdev, smp->responder_csrk, persistent); + } + + if (smp->ltk) { ++ smp->ltk->link_type = hcon->type; + smp->ltk->bdaddr_type = hcon->dst_type; + bacpy(&smp->ltk->bdaddr, &hcon->dst); + mgmt_new_ltk(hdev, smp->ltk, persistent); + } + + if (smp->responder_ltk) { ++ smp->responder_ltk->link_type = hcon->type; + smp->responder_ltk->bdaddr_type = hcon->dst_type; + bacpy(&smp->responder_ltk->bdaddr, &hcon->dst); + mgmt_new_ltk(hdev, smp->responder_ltk, persistent); +@@ -1109,6 +1114,8 @@ static void smp_notify_keys(struct l2cap + key = hci_add_link_key(hdev, smp->conn->hcon, &hcon->dst, + smp->link_key, type, 0, &persistent); + if (key) { ++ key->link_type = hcon->type; ++ key->bdaddr_type = hcon->dst_type; + mgmt_new_link_key(hdev, key, persistent); + + /* Don't keep debug keys around if the relevant diff --git a/queue-5.15/series b/queue-5.15/series index 1581b852137..ebed61242c0 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -42,3 +42,12 @@ iio-imu-adis16475-add-spi_device_id-table.patch iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch iio-triggered-buffer-prevent-possible-freeing-of-wrong-buffer.patch alsa-usb-audio-increase-delay-in-motu-m-quirk.patch +wifi-cfg80211-add-my-certificate.patch +wifi-cfg80211-fix-certs-build-to-not-depend-on-file-order.patch +usb-serial-ftdi_sio-update-actisense-pids-constant-names.patch +usb-serial-option-add-quectel-eg912y-module-support.patch +usb-serial-option-add-foxconn-t99w265-with-new-baseline.patch +usb-serial-option-add-quectel-rm500q-r13-firmware-support.patch +bluetooth-hci_event-fix-not-checking-if-hci_op_inquiry-has-been-sent.patch +bluetooth-l2cap-send-reject-on-command-corrupted-request.patch +bluetooth-mgmt-smp-fix-address-type-when-using-smp-over-bredr-le.patch diff --git a/queue-5.15/usb-serial-ftdi_sio-update-actisense-pids-constant-names.patch b/queue-5.15/usb-serial-ftdi_sio-update-actisense-pids-constant-names.patch new file mode 100644 index 00000000000..d6214248c9b --- /dev/null +++ b/queue-5.15/usb-serial-ftdi_sio-update-actisense-pids-constant-names.patch @@ -0,0 +1,51 @@ +From 513d88a88e0203188a38f4647dd08170aebd85df Mon Sep 17 00:00:00 2001 +From: Mark Glover +Date: Wed, 20 Dec 2023 13:57:40 +0000 +Subject: USB: serial: ftdi_sio: update Actisense PIDs constant names + +From: Mark Glover + +commit 513d88a88e0203188a38f4647dd08170aebd85df upstream. + +Update the constant names for unused USB PIDs (product identifiers) to +reflect the new products now using the PIDs. + +Signed-off-by: Mark Glover +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/ftdi_sio.c | 6 +++--- + drivers/usb/serial/ftdi_sio_ids.h | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -1011,9 +1011,9 @@ static const struct usb_device_id id_tab + { USB_DEVICE(FTDI_VID, ACTISENSE_USG_PID) }, + { USB_DEVICE(FTDI_VID, ACTISENSE_NGT_PID) }, + { USB_DEVICE(FTDI_VID, ACTISENSE_NGW_PID) }, +- { USB_DEVICE(FTDI_VID, ACTISENSE_D9AC_PID) }, +- { USB_DEVICE(FTDI_VID, ACTISENSE_D9AD_PID) }, +- { USB_DEVICE(FTDI_VID, ACTISENSE_D9AE_PID) }, ++ { USB_DEVICE(FTDI_VID, ACTISENSE_UID_PID) }, ++ { USB_DEVICE(FTDI_VID, ACTISENSE_USA_PID) }, ++ { USB_DEVICE(FTDI_VID, ACTISENSE_NGX_PID) }, + { USB_DEVICE(FTDI_VID, ACTISENSE_D9AF_PID) }, + { USB_DEVICE(FTDI_VID, CHETCO_SEAGAUGE_PID) }, + { USB_DEVICE(FTDI_VID, CHETCO_SEASWITCH_PID) }, +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -1561,9 +1561,9 @@ + #define ACTISENSE_USG_PID 0xD9A9 /* USG USB Serial Adapter */ + #define ACTISENSE_NGT_PID 0xD9AA /* NGT NMEA2000 Interface */ + #define ACTISENSE_NGW_PID 0xD9AB /* NGW NMEA2000 Gateway */ +-#define ACTISENSE_D9AC_PID 0xD9AC /* Actisense Reserved */ +-#define ACTISENSE_D9AD_PID 0xD9AD /* Actisense Reserved */ +-#define ACTISENSE_D9AE_PID 0xD9AE /* Actisense Reserved */ ++#define ACTISENSE_UID_PID 0xD9AC /* USB Isolating Device */ ++#define ACTISENSE_USA_PID 0xD9AD /* USB to Serial Adapter */ ++#define ACTISENSE_NGX_PID 0xD9AE /* NGX NMEA2000 Gateway */ + #define ACTISENSE_D9AF_PID 0xD9AF /* Actisense Reserved */ + #define CHETCO_SEAGAUGE_PID 0xA548 /* SeaGauge USB Adapter */ + #define CHETCO_SEASWITCH_PID 0xA549 /* SeaSwitch USB Adapter */ diff --git a/queue-5.15/usb-serial-option-add-foxconn-t99w265-with-new-baseline.patch b/queue-5.15/usb-serial-option-add-foxconn-t99w265-with-new-baseline.patch new file mode 100644 index 00000000000..95cd2044d04 --- /dev/null +++ b/queue-5.15/usb-serial-option-add-foxconn-t99w265-with-new-baseline.patch @@ -0,0 +1,48 @@ +From 13fde9ac23ca8c6d1ac13cc9eefe1f1ac3ee30a4 Mon Sep 17 00:00:00 2001 +From: Slark Xiao +Date: Fri, 1 Dec 2023 10:09:50 +0800 +Subject: USB: serial: option: add Foxconn T99W265 with new baseline + +From: Slark Xiao + +commit 13fde9ac23ca8c6d1ac13cc9eefe1f1ac3ee30a4 upstream. + +This ID was added based on latest SDX12 code base line, and we +made some changes with previous 0489:e0db. + +Test evidence as below: +T: Bus=02 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 3 Spd=5000 MxCh= 0 +D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 2 +P: Vendor=0489 ProdID=e0da Rev=05.04 +S: Manufacturer=Qualcomm +S: Product=Qualcomm Snapdragon X12 +S: SerialNumber=2bda65fb +C: #Ifs= 6 Cfg#= 2 Atr=a0 MxPwr=896mA +I: If#=0x0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim +I: If#=0x1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim +I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option +I: If#=0x3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) +I: If#=0x4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) + +0&1: MBIM, 2: Modem, 3:GNSS, 4:Diag, 5:ADB + +Signed-off-by: Slark Xiao +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/option.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -2244,6 +2244,8 @@ static const struct usb_device_id option + .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, + { USB_DEVICE(0x0489, 0xe0b5), /* Foxconn T77W968 ESIM */ + .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, ++ { USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0da, 0xff), /* Foxconn T99W265 MBIM variant */ ++ .driver_info = RSVD(3) | RSVD(5) }, + { USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0db, 0xff), /* Foxconn T99W265 MBIM */ + .driver_info = RSVD(3) }, + { USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0ee, 0xff), /* Foxconn T99W368 MBIM */ diff --git a/queue-5.15/usb-serial-option-add-quectel-eg912y-module-support.patch b/queue-5.15/usb-serial-option-add-quectel-eg912y-module-support.patch new file mode 100644 index 00000000000..f11cd62059d --- /dev/null +++ b/queue-5.15/usb-serial-option-add-quectel-eg912y-module-support.patch @@ -0,0 +1,65 @@ +From 6d79d9434c69bb8ffa8a631050eb0ad6b83d3e90 Mon Sep 17 00:00:00 2001 +From: Alper Ak +Date: Tue, 8 Aug 2023 13:51:58 +0300 +Subject: USB: serial: option: add Quectel EG912Y module support + +From: Alper Ak + +commit 6d79d9434c69bb8ffa8a631050eb0ad6b83d3e90 upstream. + +Add Quectel EG912Y "DIAG, AT, MODEM" + +0x6001: ECM / RNDIS + DIAG + AT + MODEM + +T: Bus=01 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 3 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=2c7c ProdID=6001 Rev= 3.18 +S: Manufacturer=Android +S: Product=Android +S: SerialNumber=0000 +C:* #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA +A: FirstIf#= 0 IfCount= 2 Cls=02(comm.) Sub=06 Prot=00 +I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=06 Prot=00 Driver=cdc_ether +E: Ad=87(I) Atr=03(Int.) MxPS= 64 Ivl=4096ms +I: If#= 1 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether +I:* If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether +E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=0c(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=0b(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=89(I) Atr=03(Int.) MxPS= 64 Ivl=4096ms +E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=0f(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=88(I) Atr=03(Int.) MxPS= 64 Ivl=4096ms +E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=0a(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +Signed-off-by: Alper Ak +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/option.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -272,6 +272,7 @@ static void option_instat_callback(struc + #define QUECTEL_PRODUCT_RM500Q 0x0800 + #define QUECTEL_PRODUCT_RM520N 0x0801 + #define QUECTEL_PRODUCT_EC200U 0x0901 ++#define QUECTEL_PRODUCT_EG912Y 0x6001 + #define QUECTEL_PRODUCT_EC200S_CN 0x6002 + #define QUECTEL_PRODUCT_EC200A 0x6005 + #define QUECTEL_PRODUCT_EM061K_LWW 0x6008 +@@ -1244,6 +1245,7 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200U, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG912Y, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) }, + + { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) }, diff --git a/queue-5.15/usb-serial-option-add-quectel-rm500q-r13-firmware-support.patch b/queue-5.15/usb-serial-option-add-quectel-rm500q-r13-firmware-support.patch new file mode 100644 index 00000000000..14dd810befe --- /dev/null +++ b/queue-5.15/usb-serial-option-add-quectel-rm500q-r13-firmware-support.patch @@ -0,0 +1,57 @@ +From 06f22cd6635bdae7d73566fca9879b2026a08e00 Mon Sep 17 00:00:00 2001 +From: Reinhard Speyerer +Date: Tue, 12 Dec 2023 18:15:38 +0100 +Subject: USB: serial: option: add Quectel RM500Q R13 firmware support + +From: Reinhard Speyerer + +commit 06f22cd6635bdae7d73566fca9879b2026a08e00 upstream. + +Add support for Quectel RM500Q R13 firmware which uses Prot=40 for the +NMEA port: + +T: Bus=02 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 8 Spd=5000 MxCh= 0 +D: Ver= 3.20 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 9 #Cfgs= 1 +P: Vendor=2c7c ProdID=0800 Rev= 4.14 +S: Manufacturer=Quectel +S: Product=RM500Q-AE +S: SerialNumber=xxxxxxxx +C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=896mA +I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=81(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=40 Driver=option +E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=82(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=02(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=84(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=03(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=86(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=04(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan +E: Ad=88(I) Atr=03(Int.) MxPS= 8 Ivl=32ms +E: Ad=8e(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=0f(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms + +Signed-off-by: Reinhard Speyerer +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/option.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -1233,6 +1233,7 @@ static const struct usb_device_id option + { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, 0x0700, 0xff), /* BG95 */ + .driver_info = RSVD(3) | ZLP }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x30) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10), + .driver_info = ZLP }, diff --git a/queue-5.15/wifi-cfg80211-add-my-certificate.patch b/queue-5.15/wifi-cfg80211-add-my-certificate.patch new file mode 100644 index 00000000000..c77d7d0a58a --- /dev/null +++ b/queue-5.15/wifi-cfg80211-add-my-certificate.patch @@ -0,0 +1,123 @@ +From fb768d3b13ffa325b7e84480d488ac799c9d2cd7 Mon Sep 17 00:00:00 2001 +From: Chen-Yu Tsai +Date: Thu, 7 Dec 2023 21:20:50 +0800 +Subject: wifi: cfg80211: Add my certificate + +From: Chen-Yu Tsai + +commit fb768d3b13ffa325b7e84480d488ac799c9d2cd7 upstream. + +As announced [1][2], I have taken over maintainership of the +wireless-regdb project. + +Add my certificate so that newer releases are valid to the kernel. +Seth's certificate should be kept around for awhile, at least until +a few new releases by me happen. + +This should also be applied to stable trees so that stable kernels +can utilize newly released database binaries. + +[1] https://lore.kernel.org/linux-wireless/CAGb2v657baNMPKU3QADijx7hZa=GUcSv2LEDdn6N=QQaFX8r-g@mail.gmail.com/ +[2] https://lore.kernel.org/linux-wireless/ZWmRR5ul7EDfxCan@wens.tw/ + +Cc: stable@vger.kernel.org +Signed-off-by: Chen-Yu Tsai +Acked-by: Seth Forshee +Link: https://msgid.link/ZXHGsqs34qZyzZng@wens.tw +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman +--- + net/wireless/certs/wens.hex | 87 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 87 insertions(+) + create mode 100644 net/wireless/certs/wens.hex + +--- /dev/null ++++ b/net/wireless/certs/wens.hex +@@ -0,0 +1,87 @@ ++/* Chen-Yu Tsai's regdb certificate */ ++0x30, 0x82, 0x02, 0xa7, 0x30, 0x82, 0x01, 0x8f, ++0x02, 0x14, 0x61, 0xc0, 0x38, 0x65, 0x1a, 0xab, ++0xdc, 0xf9, 0x4b, 0xd0, 0xac, 0x7f, 0xf0, 0x6c, ++0x72, 0x48, 0xdb, 0x18, 0xc6, 0x00, 0x30, 0x0d, ++0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, ++0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x0f, 0x31, ++0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x03, ++0x0c, 0x04, 0x77, 0x65, 0x6e, 0x73, 0x30, 0x20, ++0x17, 0x0d, 0x32, 0x33, 0x31, 0x32, 0x30, 0x31, ++0x30, 0x37, 0x34, 0x31, 0x31, 0x34, 0x5a, 0x18, ++0x0f, 0x32, 0x31, 0x32, 0x33, 0x31, 0x31, 0x30, ++0x37, 0x30, 0x37, 0x34, 0x31, 0x31, 0x34, 0x5a, ++0x30, 0x0f, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, ++0x55, 0x04, 0x03, 0x0c, 0x04, 0x77, 0x65, 0x6e, ++0x73, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, ++0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, ++0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, ++0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, ++0x01, 0x00, 0xa9, 0x7a, 0x2c, 0x78, 0x4d, 0xa7, ++0x19, 0x2d, 0x32, 0x52, 0xa0, 0x2e, 0x6c, 0xef, ++0x88, 0x7f, 0x15, 0xc5, 0xb6, 0x69, 0x54, 0x16, ++0x43, 0x14, 0x79, 0x53, 0xb7, 0xae, 0x88, 0xfe, ++0xc0, 0xb7, 0x5d, 0x47, 0x8e, 0x1a, 0xe1, 0xef, ++0xb3, 0x90, 0x86, 0xda, 0xd3, 0x64, 0x81, 0x1f, ++0xce, 0x5d, 0x9e, 0x4b, 0x6e, 0x58, 0x02, 0x3e, ++0xb2, 0x6f, 0x5e, 0x42, 0x47, 0x41, 0xf4, 0x2c, ++0xb8, 0xa8, 0xd4, 0xaa, 0xc0, 0x0e, 0xe6, 0x48, ++0xf0, 0xa8, 0xce, 0xcb, 0x08, 0xae, 0x37, 0xaf, ++0xf6, 0x40, 0x39, 0xcb, 0x55, 0x6f, 0x5b, 0x4f, ++0x85, 0x34, 0xe6, 0x69, 0x10, 0x50, 0x72, 0x5e, ++0x4e, 0x9d, 0x4c, 0xba, 0x38, 0x36, 0x0d, 0xce, ++0x73, 0x38, 0xd7, 0x27, 0x02, 0x2a, 0x79, 0x03, ++0xe1, 0xac, 0xcf, 0xb0, 0x27, 0x85, 0x86, 0x93, ++0x17, 0xab, 0xec, 0x42, 0x77, 0x37, 0x65, 0x8a, ++0x44, 0xcb, 0xd6, 0x42, 0x93, 0x92, 0x13, 0xe3, ++0x39, 0x45, 0xc5, 0x6e, 0x00, 0x4a, 0x7f, 0xcb, ++0x42, 0x17, 0x2b, 0x25, 0x8c, 0xb8, 0x17, 0x3b, ++0x15, 0x36, 0x59, 0xde, 0x42, 0xce, 0x21, 0xe6, ++0xb6, 0xc7, 0x6e, 0x5e, 0x26, 0x1f, 0xf7, 0x8a, ++0x57, 0x9e, 0xa5, 0x96, 0x72, 0xb7, 0x02, 0x32, ++0xeb, 0x07, 0x2b, 0x73, 0xe2, 0x4f, 0x66, 0x58, ++0x9a, 0xeb, 0x0f, 0x07, 0xb6, 0xab, 0x50, 0x8b, ++0xc3, 0x8f, 0x17, 0xfa, 0x0a, 0x99, 0xc2, 0x16, ++0x25, 0xbf, 0x2d, 0x6b, 0x1a, 0xaa, 0xe6, 0x3e, ++0x5f, 0xeb, 0x6d, 0x9b, 0x5d, 0x4d, 0x42, 0x83, ++0x2d, 0x39, 0xb8, 0xc9, 0xac, 0xdb, 0x3a, 0x91, ++0x50, 0xdf, 0xbb, 0xb1, 0x76, 0x6d, 0x15, 0x73, ++0xfd, 0xc6, 0xe6, 0x6b, 0x71, 0x9e, 0x67, 0x36, ++0x22, 0x83, 0x79, 0xb1, 0xd6, 0xb8, 0x84, 0x52, ++0xaf, 0x96, 0x5b, 0xc3, 0x63, 0x02, 0x4e, 0x78, ++0x70, 0x57, 0x02, 0x03, 0x01, 0x00, 0x01, 0x30, ++0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, ++0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, ++0x01, 0x01, 0x00, 0x24, 0x28, 0xee, 0x22, 0x74, ++0x7f, 0x7c, 0xfa, 0x6c, 0x1f, 0xb3, 0x18, 0xd1, ++0xc2, 0x3d, 0x7d, 0x29, 0x42, 0x88, 0xad, 0x82, ++0xa5, 0xb1, 0x8a, 0x05, 0xd0, 0xec, 0x5c, 0x91, ++0x20, 0xf6, 0x82, 0xfd, 0xd5, 0x67, 0x60, 0x5f, ++0x31, 0xf5, 0xbd, 0x88, 0x91, 0x70, 0xbd, 0xb8, ++0xb9, 0x8c, 0x88, 0xfe, 0x53, 0xc9, 0x54, 0x9b, ++0x43, 0xc4, 0x7a, 0x43, 0x74, 0x6b, 0xdd, 0xb0, ++0xb1, 0x3b, 0x33, 0x45, 0x46, 0x78, 0xa3, 0x1c, ++0xef, 0x54, 0x68, 0xf7, 0x85, 0x9c, 0xe4, 0x51, ++0x6f, 0x06, 0xaf, 0x81, 0xdb, 0x2a, 0x7b, 0x7b, ++0x6f, 0xa8, 0x9c, 0x67, 0xd8, 0xcb, 0xc9, 0x91, ++0x40, 0x00, 0xae, 0xd9, 0xa1, 0x9f, 0xdd, 0xa6, ++0x43, 0x0e, 0x28, 0x7b, 0xaa, 0x1b, 0xe9, 0x84, ++0xdb, 0x76, 0x64, 0x42, 0x70, 0xc9, 0xc0, 0xeb, ++0xae, 0x84, 0x11, 0x16, 0x68, 0x4e, 0x84, 0x9e, ++0x7e, 0x92, 0x36, 0xee, 0x1c, 0x3b, 0x08, 0x63, ++0xeb, 0x79, 0x84, 0x15, 0x08, 0x9d, 0xaf, 0xc8, ++0x9a, 0xc7, 0x34, 0xd3, 0x94, 0x4b, 0xd1, 0x28, ++0x97, 0xbe, 0xd1, 0x45, 0x75, 0xdc, 0x35, 0x62, ++0xac, 0x1d, 0x1f, 0xb7, 0xb7, 0x15, 0x87, 0xc8, ++0x98, 0xc0, 0x24, 0x31, 0x56, 0x8d, 0xed, 0xdb, ++0x06, 0xc6, 0x46, 0xbf, 0x4b, 0x6d, 0xa6, 0xd5, ++0xab, 0xcc, 0x60, 0xfc, 0xe5, 0x37, 0xb6, 0x53, ++0x7d, 0x58, 0x95, 0xa9, 0x56, 0xc7, 0xf7, 0xee, ++0xc3, 0xa0, 0x76, 0xf7, 0x65, 0x4d, 0x53, 0xfa, ++0xff, 0x5f, 0x76, 0x33, 0x5a, 0x08, 0xfa, 0x86, ++0x92, 0x5a, 0x13, 0xfa, 0x1a, 0xfc, 0xf2, 0x1b, ++0x8c, 0x7f, 0x42, 0x6d, 0xb7, 0x7e, 0xb7, 0xb4, ++0xf0, 0xc7, 0x83, 0xbb, 0xa2, 0x81, 0x03, 0x2d, ++0xd4, 0x2a, 0x63, 0x3f, 0xf7, 0x31, 0x2e, 0x40, ++0x33, 0x5c, 0x46, 0xbc, 0x9b, 0xc1, 0x05, 0xa5, ++0x45, 0x4e, 0xc3 diff --git a/queue-5.15/wifi-cfg80211-fix-certs-build-to-not-depend-on-file-order.patch b/queue-5.15/wifi-cfg80211-fix-certs-build-to-not-depend-on-file-order.patch new file mode 100644 index 00000000000..9d370cf4d6f --- /dev/null +++ b/queue-5.15/wifi-cfg80211-fix-certs-build-to-not-depend-on-file-order.patch @@ -0,0 +1,32 @@ +From 3c2a8ebe3fe66a5f77d4c164a0bea8e2ff37b455 Mon Sep 17 00:00:00 2001 +From: Johannes Berg +Date: Thu, 14 Dec 2023 09:08:16 +0100 +Subject: wifi: cfg80211: fix certs build to not depend on file order + +From: Johannes Berg + +commit 3c2a8ebe3fe66a5f77d4c164a0bea8e2ff37b455 upstream. + +The file for the new certificate (Chen-Yu Tsai's) didn't +end with a comma, so depending on the file order in the +build rule, we'd end up with invalid C when concatenating +the (now two) certificates. Fix that. + +Cc: stable@vger.kernel.org +Reported-by: Biju Das +Reported-by: Naresh Kamboju +Fixes: fb768d3b13ff ("wifi: cfg80211: Add my certificate") +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman +--- + net/wireless/certs/wens.hex | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/wireless/certs/wens.hex ++++ b/net/wireless/certs/wens.hex +@@ -84,4 +84,4 @@ + 0xf0, 0xc7, 0x83, 0xbb, 0xa2, 0x81, 0x03, 0x2d, + 0xd4, 0x2a, 0x63, 0x3f, 0xf7, 0x31, 0x2e, 0x40, + 0x33, 0x5c, 0x46, 0xbc, 0x9b, 0xc1, 0x05, 0xa5, +-0x45, 0x4e, 0xc3 ++0x45, 0x4e, 0xc3,