From: Greg Kroah-Hartman Date: Mon, 29 Apr 2024 13:43:23 +0000 (+0200) Subject: drop some patches at the request of the developers X-Git-Tag: v4.19.313~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=449d25ffd772af8bce89a0f91b6664a8ebe0d879;p=thirdparty%2Fkernel%2Fstable-queue.git drop some patches at the request of the developers --- diff --git a/queue-4.19/series b/queue-4.19/series index 69468b66fab..17398a768c4 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -64,7 +64,6 @@ arm64-dts-rockchip-enable-internal-pull-up-for-q7_thrm-on-rk3399-puma.patch irqchip-gic-v3-its-prevent-double-free-on-error.patch net-b44-set-pause-params-only-when-interface-is-up.patch stackdepot-respect-__gfp_nolockdep-allocation-flag.patch -wifi-nl80211-don-t-free-null-coalescing-rule.patch mtd-diskonchip-work-around-ubsan-link-failure.patch tcp-clean-up-kernel-listener-s-reqsk-in-inet_twsk_purge.patch tcp-fix-new_syn_recv-handling-in-inet_twsk_purge.patch diff --git a/queue-4.19/wifi-nl80211-don-t-free-null-coalescing-rule.patch b/queue-4.19/wifi-nl80211-don-t-free-null-coalescing-rule.patch deleted file mode 100644 index 22db85e8549..00000000000 --- a/queue-4.19/wifi-nl80211-don-t-free-null-coalescing-rule.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 Mon Sep 17 00:00:00 2001 -From: Johannes Berg -Date: Thu, 18 Apr 2024 10:52:23 +0200 -Subject: wifi: nl80211: don't free NULL coalescing rule - -From: Johannes Berg - -commit 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 upstream. - -If the parsing fails, we can dereference a NULL pointer here. - -Cc: stable@vger.kernel.org -Fixes: be29b99a9b51 ("cfg80211/nl80211: Add packet coalesce support") -Reviewed-by: Miriam Rachel Korenblit -Link: https://msgid.link/20240418105220.b328f80406e7.Id75d961050deb05b3e4e354e024866f350c68103@changeid -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman ---- - net/wireless/nl80211.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -11492,6 +11492,8 @@ static int nl80211_set_coalesce(struct s - error: - for (i = 0; i < new_coalesce.n_rules; i++) { - tmp_rule = &new_coalesce.rules[i]; -+ if (!tmp_rule) -+ continue; - for (j = 0; j < tmp_rule->n_patterns; j++) - kfree(tmp_rule->patterns[j].mask); - kfree(tmp_rule->patterns); diff --git a/queue-5.10/series b/queue-5.10/series index d773be5ea0e..461351d3e38 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -122,7 +122,6 @@ irqchip-gic-v3-its-prevent-double-free-on-error.patch ethernet-add-helper-for-assigning-packet-type-when-dest-address-does-not-match-device-address.patch net-b44-set-pause-params-only-when-interface-is-up.patch stackdepot-respect-__gfp_nolockdep-allocation-flag.patch -wifi-nl80211-don-t-free-null-coalescing-rule.patch mtd-diskonchip-work-around-ubsan-link-failure.patch tcp-clean-up-kernel-listener-s-reqsk-in-inet_twsk_purge.patch tcp-fix-new_syn_recv-handling-in-inet_twsk_purge.patch diff --git a/queue-5.10/wifi-nl80211-don-t-free-null-coalescing-rule.patch b/queue-5.10/wifi-nl80211-don-t-free-null-coalescing-rule.patch deleted file mode 100644 index 4e8d4ac0cf2..00000000000 --- a/queue-5.10/wifi-nl80211-don-t-free-null-coalescing-rule.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 Mon Sep 17 00:00:00 2001 -From: Johannes Berg -Date: Thu, 18 Apr 2024 10:52:23 +0200 -Subject: wifi: nl80211: don't free NULL coalescing rule - -From: Johannes Berg - -commit 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 upstream. - -If the parsing fails, we can dereference a NULL pointer here. - -Cc: stable@vger.kernel.org -Fixes: be29b99a9b51 ("cfg80211/nl80211: Add packet coalesce support") -Reviewed-by: Miriam Rachel Korenblit -Link: https://msgid.link/20240418105220.b328f80406e7.Id75d961050deb05b3e4e354e024866f350c68103@changeid -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman ---- - net/wireless/nl80211.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -12642,6 +12642,8 @@ static int nl80211_set_coalesce(struct s - error: - for (i = 0; i < new_coalesce.n_rules; i++) { - tmp_rule = &new_coalesce.rules[i]; -+ if (!tmp_rule) -+ continue; - for (j = 0; j < tmp_rule->n_patterns; j++) - kfree(tmp_rule->patterns[j].mask); - kfree(tmp_rule->patterns); diff --git a/queue-5.15/series b/queue-5.15/series index 895d039f786..40ac13c936b 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -63,7 +63,6 @@ irqchip-gic-v3-its-prevent-double-free-on-error.patch ethernet-add-helper-for-assigning-packet-type-when-dest-address-does-not-match-device-address.patch net-b44-set-pause-params-only-when-interface-is-up.patch stackdepot-respect-__gfp_nolockdep-allocation-flag.patch -wifi-nl80211-don-t-free-null-coalescing-rule.patch mtd-diskonchip-work-around-ubsan-link-failure.patch tcp-clean-up-kernel-listener-s-reqsk-in-inet_twsk_purge.patch tcp-fix-new_syn_recv-handling-in-inet_twsk_purge.patch diff --git a/queue-5.15/wifi-nl80211-don-t-free-null-coalescing-rule.patch b/queue-5.15/wifi-nl80211-don-t-free-null-coalescing-rule.patch deleted file mode 100644 index 3da8220444a..00000000000 --- a/queue-5.15/wifi-nl80211-don-t-free-null-coalescing-rule.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 Mon Sep 17 00:00:00 2001 -From: Johannes Berg -Date: Thu, 18 Apr 2024 10:52:23 +0200 -Subject: wifi: nl80211: don't free NULL coalescing rule - -From: Johannes Berg - -commit 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 upstream. - -If the parsing fails, we can dereference a NULL pointer here. - -Cc: stable@vger.kernel.org -Fixes: be29b99a9b51 ("cfg80211/nl80211: Add packet coalesce support") -Reviewed-by: Miriam Rachel Korenblit -Link: https://msgid.link/20240418105220.b328f80406e7.Id75d961050deb05b3e4e354e024866f350c68103@changeid -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman ---- - net/wireless/nl80211.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -12890,6 +12890,8 @@ static int nl80211_set_coalesce(struct s - error: - for (i = 0; i < new_coalesce.n_rules; i++) { - tmp_rule = &new_coalesce.rules[i]; -+ if (!tmp_rule) -+ continue; - for (j = 0; j < tmp_rule->n_patterns; j++) - kfree(tmp_rule->patterns[j].mask); - kfree(tmp_rule->patterns); diff --git a/queue-5.4/series b/queue-5.4/series index 3936ab2ef1c..1515afbe6d3 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -94,7 +94,6 @@ irqchip-gic-v3-its-prevent-double-free-on-error.patch ethernet-add-helper-for-assigning-packet-type-when-dest-address-does-not-match-device-address.patch net-b44-set-pause-params-only-when-interface-is-up.patch stackdepot-respect-__gfp_nolockdep-allocation-flag.patch -wifi-nl80211-don-t-free-null-coalescing-rule.patch mtd-diskonchip-work-around-ubsan-link-failure.patch tcp-clean-up-kernel-listener-s-reqsk-in-inet_twsk_purge.patch tcp-fix-new_syn_recv-handling-in-inet_twsk_purge.patch diff --git a/queue-5.4/wifi-nl80211-don-t-free-null-coalescing-rule.patch b/queue-5.4/wifi-nl80211-don-t-free-null-coalescing-rule.patch deleted file mode 100644 index 3f662f02d75..00000000000 --- a/queue-5.4/wifi-nl80211-don-t-free-null-coalescing-rule.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 Mon Sep 17 00:00:00 2001 -From: Johannes Berg -Date: Thu, 18 Apr 2024 10:52:23 +0200 -Subject: wifi: nl80211: don't free NULL coalescing rule - -From: Johannes Berg - -commit 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 upstream. - -If the parsing fails, we can dereference a NULL pointer here. - -Cc: stable@vger.kernel.org -Fixes: be29b99a9b51 ("cfg80211/nl80211: Add packet coalesce support") -Reviewed-by: Miriam Rachel Korenblit -Link: https://msgid.link/20240418105220.b328f80406e7.Id75d961050deb05b3e4e354e024866f350c68103@changeid -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman ---- - net/wireless/nl80211.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -12023,6 +12023,8 @@ static int nl80211_set_coalesce(struct s - error: - for (i = 0; i < new_coalesce.n_rules; i++) { - tmp_rule = &new_coalesce.rules[i]; -+ if (!tmp_rule) -+ continue; - for (j = 0; j < tmp_rule->n_patterns; j++) - kfree(tmp_rule->patterns[j].mask); - kfree(tmp_rule->patterns); diff --git a/queue-6.1/series b/queue-6.1/series index 99181ccb7e6..b7c38f23415 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -86,5 +86,4 @@ net-b44-set-pause-params-only-when-interface-is-up.patch stackdepot-respect-__gfp_nolockdep-allocation-flag.patch fbdev-fix-incorrect-address-computation-in-deferred-io.patch udp-preserve-the-connected-status-if-only-udp-cmsg.patch -wifi-nl80211-don-t-free-null-coalescing-rule.patch mtd-diskonchip-work-around-ubsan-link-failure.patch diff --git a/queue-6.1/wifi-nl80211-don-t-free-null-coalescing-rule.patch b/queue-6.1/wifi-nl80211-don-t-free-null-coalescing-rule.patch deleted file mode 100644 index 0a8811323a8..00000000000 --- a/queue-6.1/wifi-nl80211-don-t-free-null-coalescing-rule.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 Mon Sep 17 00:00:00 2001 -From: Johannes Berg -Date: Thu, 18 Apr 2024 10:52:23 +0200 -Subject: wifi: nl80211: don't free NULL coalescing rule - -From: Johannes Berg - -commit 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 upstream. - -If the parsing fails, we can dereference a NULL pointer here. - -Cc: stable@vger.kernel.org -Fixes: be29b99a9b51 ("cfg80211/nl80211: Add packet coalesce support") -Reviewed-by: Miriam Rachel Korenblit -Link: https://msgid.link/20240418105220.b328f80406e7.Id75d961050deb05b3e4e354e024866f350c68103@changeid -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman ---- - net/wireless/nl80211.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -13802,6 +13802,8 @@ static int nl80211_set_coalesce(struct s - error: - for (i = 0; i < new_coalesce.n_rules; i++) { - tmp_rule = &new_coalesce.rules[i]; -+ if (!tmp_rule) -+ continue; - for (j = 0; j < tmp_rule->n_patterns; j++) - kfree(tmp_rule->patterns[j].mask); - kfree(tmp_rule->patterns); diff --git a/queue-6.6/series b/queue-6.6/series index 4a7a68e7ea7..900c8600b8c 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -150,7 +150,6 @@ net-b44-set-pause-params-only-when-interface-is-up.patch stackdepot-respect-__gfp_nolockdep-allocation-flag.patch fbdev-fix-incorrect-address-computation-in-deferred-io.patch udp-preserve-the-connected-status-if-only-udp-cmsg.patch -wifi-nl80211-don-t-free-null-coalescing-rule.patch mtd-diskonchip-work-around-ubsan-link-failure.patch phy-qcom-qmp-combo-fix-register-base-for-qserdes_dp_phy_mode.patch phy-qcom-qmp-combo-fix-vco-div-offset-on-v3.patch diff --git a/queue-6.6/wifi-nl80211-don-t-free-null-coalescing-rule.patch b/queue-6.6/wifi-nl80211-don-t-free-null-coalescing-rule.patch deleted file mode 100644 index 164ddb1dc29..00000000000 --- a/queue-6.6/wifi-nl80211-don-t-free-null-coalescing-rule.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 Mon Sep 17 00:00:00 2001 -From: Johannes Berg -Date: Thu, 18 Apr 2024 10:52:23 +0200 -Subject: wifi: nl80211: don't free NULL coalescing rule - -From: Johannes Berg - -commit 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 upstream. - -If the parsing fails, we can dereference a NULL pointer here. - -Cc: stable@vger.kernel.org -Fixes: be29b99a9b51 ("cfg80211/nl80211: Add packet coalesce support") -Reviewed-by: Miriam Rachel Korenblit -Link: https://msgid.link/20240418105220.b328f80406e7.Id75d961050deb05b3e4e354e024866f350c68103@changeid -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman ---- - net/wireless/nl80211.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -14052,6 +14052,8 @@ static int nl80211_set_coalesce(struct s - error: - for (i = 0; i < new_coalesce.n_rules; i++) { - tmp_rule = &new_coalesce.rules[i]; -+ if (!tmp_rule) -+ continue; - for (j = 0; j < tmp_rule->n_patterns; j++) - kfree(tmp_rule->patterns[j].mask); - kfree(tmp_rule->patterns); diff --git a/queue-6.8/bluetooth-qca-fix-invalid-device-address-check.patch b/queue-6.8/bluetooth-qca-fix-invalid-device-address-check.patch deleted file mode 100644 index b4caf5f0421..00000000000 --- a/queue-6.8/bluetooth-qca-fix-invalid-device-address-check.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 32868e126c78876a8a5ddfcb6ac8cb2fffcf4d27 Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Tue, 16 Apr 2024 11:15:09 +0200 -Subject: Bluetooth: qca: fix invalid device address check - -From: Johan Hovold - -commit 32868e126c78876a8a5ddfcb6ac8cb2fffcf4d27 upstream. - -Qualcomm Bluetooth controllers may not have been provisioned with a -valid device address and instead end up using the default address -00:00:00:00:5a:ad. - -This was previously believed to be due to lack of persistent storage for -the address but it may also be due to integrators opting to not use the -on-chip OTP memory and instead store the address elsewhere (e.g. in -storage managed by secure world firmware). - -According to Qualcomm, at least WCN6750, WCN6855 and WCN7850 have -on-chip OTP storage for the address. - -As the device type alone cannot be used to determine when the address is -valid, instead read back the address during setup() and only set the -HCI_QUIRK_USE_BDADDR_PROPERTY flag when needed. - -This specifically makes sure that controllers that have been provisioned -with an address do not start as unconfigured. - -Reported-by: Janaki Ramaiah Thota -Link: https://lore.kernel.org/r/124a7d54-5a18-4be7-9a76-a12017f6cce5@quicinc.com/ -Fixes: 5971752de44c ("Bluetooth: hci_qca: Set HCI_QUIRK_USE_BDADDR_PROPERTY for wcn3990") -Fixes: e668eb1e1578 ("Bluetooth: hci_core: Don't stop BT if the BD address missing in dts") -Fixes: 6945795bc81a ("Bluetooth: fix use-bdaddr-property quirk") -Cc: stable@vger.kernel.org # 6.5 -Cc: Matthias Kaehlcke -Signed-off-by: Johan Hovold -Reported-by: Janaki Ramaiah Thota -Signed-off-by: Luiz Augusto von Dentz -Signed-off-by: Greg Kroah-Hartman ---- - drivers/bluetooth/btqca.c | 38 ++++++++++++++++++++++++++++++++++++++ - drivers/bluetooth/hci_qca.c | 2 -- - 2 files changed, 38 insertions(+), 2 deletions(-) - ---- a/drivers/bluetooth/btqca.c -+++ b/drivers/bluetooth/btqca.c -@@ -15,6 +15,8 @@ - - #define VERSION "0.1" - -+#define QCA_BDADDR_DEFAULT (&(bdaddr_t) {{ 0xad, 0x5a, 0x00, 0x00, 0x00, 0x00 }}) -+ - int qca_read_soc_version(struct hci_dev *hdev, struct qca_btsoc_version *ver, - enum qca_btsoc_type soc_type) - { -@@ -612,6 +614,38 @@ int qca_set_bdaddr_rome(struct hci_dev * - } - EXPORT_SYMBOL_GPL(qca_set_bdaddr_rome); - -+static int qca_check_bdaddr(struct hci_dev *hdev) -+{ -+ struct hci_rp_read_bd_addr *bda; -+ struct sk_buff *skb; -+ int err; -+ -+ if (bacmp(&hdev->public_addr, BDADDR_ANY)) -+ return 0; -+ -+ skb = __hci_cmd_sync(hdev, HCI_OP_READ_BD_ADDR, 0, NULL, -+ HCI_INIT_TIMEOUT); -+ if (IS_ERR(skb)) { -+ err = PTR_ERR(skb); -+ bt_dev_err(hdev, "Failed to read device address (%d)", err); -+ return err; -+ } -+ -+ if (skb->len != sizeof(*bda)) { -+ bt_dev_err(hdev, "Device address length mismatch"); -+ kfree_skb(skb); -+ return -EIO; -+ } -+ -+ bda = (struct hci_rp_read_bd_addr *)skb->data; -+ if (!bacmp(&bda->bdaddr, QCA_BDADDR_DEFAULT)) -+ set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); -+ -+ kfree_skb(skb); -+ -+ return 0; -+} -+ - static void qca_generate_hsp_nvm_name(char *fwname, size_t max_size, - struct qca_btsoc_version ver, u8 rom_ver, u16 bid) - { -@@ -818,6 +852,10 @@ int qca_uart_setup(struct hci_dev *hdev, - break; - } - -+ err = qca_check_bdaddr(hdev); -+ if (err) -+ return err; -+ - bt_dev_info(hdev, "QCA setup on UART is completed"); - - return 0; ---- a/drivers/bluetooth/hci_qca.c -+++ b/drivers/bluetooth/hci_qca.c -@@ -1905,8 +1905,6 @@ retry: - case QCA_WCN6750: - case QCA_WCN6855: - case QCA_WCN7850: -- set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); -- - qcadev = serdev_device_get_drvdata(hu->serdev); - if (qcadev->bdaddr_property_broken) - set_bit(HCI_QUIRK_BDADDR_PROPERTY_BROKEN, &hdev->quirks); diff --git a/queue-6.8/bluetooth-qca-fix-null-deref-on-non-serdev-setup.patch b/queue-6.8/bluetooth-qca-fix-null-deref-on-non-serdev-setup.patch index 362ab43a25b..ee59d6feff7 100644 --- a/queue-6.8/bluetooth-qca-fix-null-deref-on-non-serdev-setup.patch +++ b/queue-6.8/bluetooth-qca-fix-null-deref-on-non-serdev-setup.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c -@@ -1958,8 +1958,10 @@ retry: +@@ -1960,8 +1960,10 @@ retry: qca_debugfs_init(hdev); hu->hdev->hw_error = qca_hw_error; hu->hdev->cmd_timeout = qca_cmd_timeout; diff --git a/queue-6.8/series b/queue-6.8/series index ec668f194de..acb9d05f041 100644 --- a/queue-6.8/series +++ b/queue-6.8/series @@ -141,7 +141,6 @@ kbuild-rust-force-alloc-extern-to-allow-empty-rust-files.patch rust-remove-params-from-module-macro-example.patch bluetooth-fix-type-of-len-in-l2cap-sco-_sock_getsockopt_old.patch bluetooth-btusb-add-realtek-rtl8852be-support-id-0x0bda-0x4853.patch -bluetooth-qca-fix-invalid-device-address-check.patch bluetooth-qca-fix-null-deref-on-non-serdev-suspend.patch bluetooth-qca-fix-null-deref-on-non-serdev-setup.patch mtd-rawnand-qcom-fix-broken-op_reset_device-command-in-qcom_misc_cmd_type_exec.patch @@ -191,7 +190,6 @@ macsec-detect-if-rx-skb-is-macsec-related-for-offloading-devices-that-update-md_ stackdepot-respect-__gfp_nolockdep-allocation-flag.patch fbdev-fix-incorrect-address-computation-in-deferred-io.patch udp-preserve-the-connected-status-if-only-udp-cmsg.patch -wifi-nl80211-don-t-free-null-coalescing-rule.patch mtd-limit-otp-nvmem-cell-parse-to-non-nand-devices.patch mtd-diskonchip-work-around-ubsan-link-failure.patch firmware-qcom-uefisecapp-fix-memory-related-io-errors-and-crashes.patch diff --git a/queue-6.8/wifi-nl80211-don-t-free-null-coalescing-rule.patch b/queue-6.8/wifi-nl80211-don-t-free-null-coalescing-rule.patch deleted file mode 100644 index 57f394cc147..00000000000 --- a/queue-6.8/wifi-nl80211-don-t-free-null-coalescing-rule.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 Mon Sep 17 00:00:00 2001 -From: Johannes Berg -Date: Thu, 18 Apr 2024 10:52:23 +0200 -Subject: wifi: nl80211: don't free NULL coalescing rule - -From: Johannes Berg - -commit 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 upstream. - -If the parsing fails, we can dereference a NULL pointer here. - -Cc: stable@vger.kernel.org -Fixes: be29b99a9b51 ("cfg80211/nl80211: Add packet coalesce support") -Reviewed-by: Miriam Rachel Korenblit -Link: https://msgid.link/20240418105220.b328f80406e7.Id75d961050deb05b3e4e354e024866f350c68103@changeid -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman ---- - net/wireless/nl80211.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -14092,6 +14092,8 @@ static int nl80211_set_coalesce(struct s - error: - for (i = 0; i < new_coalesce.n_rules; i++) { - tmp_rule = &new_coalesce.rules[i]; -+ if (!tmp_rule) -+ continue; - for (j = 0; j < tmp_rule->n_patterns; j++) - kfree(tmp_rule->patterns[j].mask); - kfree(tmp_rule->patterns);