diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-29 15:43:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-29 15:43:23 +0200 |
| commit | 449d25ffd772af8bce89a0f91b6664a8ebe0d879 (patch) | |
| tree | b9fcce78f4604627bfb3b37c8aadb1262aa2b960 /queue-5.4 | |
| parent | e8c584b570c56cbea7d9b4f5ca1e404acb4bc551 (diff) | |
| download | stable-queue-449d25ffd772af8bce89a0f91b6664a8ebe0d879.tar.gz | |
drop some patches at the request of the developers
Diffstat (limited to 'queue-5.4')
| -rw-r--r-- | queue-5.4/series | 1 | ||||
| -rw-r--r-- | queue-5.4/wifi-nl80211-don-t-free-null-coalescing-rule.patch | 32 |
2 files changed, 0 insertions, 33 deletions
diff --git a/queue-5.4/series b/queue-5.4/series index 3936ab2ef1..1515afbe6d 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 3f662f02d7..0000000000 --- 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 <johannes.berg@intel.com> -Date: Thu, 18 Apr 2024 10:52:23 +0200 -Subject: wifi: nl80211: don't free NULL coalescing rule - -From: Johannes Berg <johannes.berg@intel.com> - -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 <miriam.rachel.korenblit@intel.com> -Link: https://msgid.link/20240418105220.b328f80406e7.Id75d961050deb05b3e4e354e024866f350c68103@changeid -Signed-off-by: Johannes Berg <johannes.berg@intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - 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); |