]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop useless batman patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2024 15:03:35 +0000 (17:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2024 15:03:35 +0000 (17:03 +0200)
20 files changed:
queue-4.19/batman-adv-return-directly-after-a-failed-batadv_dat.patch [deleted file]
queue-4.19/series
queue-5.10/batman-adv-improve-exception-handling-in-batadv_thro.patch [deleted file]
queue-5.10/batman-adv-return-directly-after-a-failed-batadv_dat.patch [deleted file]
queue-5.10/series
queue-5.15/batman-adv-improve-exception-handling-in-batadv_thro.patch [deleted file]
queue-5.15/batman-adv-return-directly-after-a-failed-batadv_dat.patch [deleted file]
queue-5.15/series
queue-5.4/batman-adv-improve-exception-handling-in-batadv_thro.patch [deleted file]
queue-5.4/batman-adv-return-directly-after-a-failed-batadv_dat.patch [deleted file]
queue-5.4/series
queue-6.1/batman-adv-improve-exception-handling-in-batadv_thro.patch [deleted file]
queue-6.1/batman-adv-return-directly-after-a-failed-batadv_dat.patch [deleted file]
queue-6.1/series
queue-6.6/batman-adv-improve-exception-handling-in-batadv_thro.patch [deleted file]
queue-6.6/batman-adv-return-directly-after-a-failed-batadv_dat.patch [deleted file]
queue-6.6/series
queue-6.8/batman-adv-improve-exception-handling-in-batadv_thro.patch [deleted file]
queue-6.8/batman-adv-return-directly-after-a-failed-batadv_dat.patch [deleted file]
queue-6.8/series

diff --git a/queue-4.19/batman-adv-return-directly-after-a-failed-batadv_dat.patch b/queue-4.19/batman-adv-return-directly-after-a-failed-batadv_dat.patch
deleted file mode 100644 (file)
index baee7a1..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0d7cf1af38db651f0497743ae85a73f207e86856 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:27:45 +0100
-Subject: batman-adv: Return directly after a failed
- batadv_dat_select_candidates() in batadv_dat_forward_data()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit ffc15626c861f811f9778914be004fcf43810a91 ]
-
-The kfree() function was called in one case by
-the batadv_dat_forward_data() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus return directly after a batadv_dat_select_candidates() call failed
-  at the beginning.
-
-* Delete the label “out” which became unnecessary with this refactoring.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/distributed-arp-table.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
-index af380dc877e31..6930d414138e1 100644
---- a/net/batman-adv/distributed-arp-table.c
-+++ b/net/batman-adv/distributed-arp-table.c
-@@ -648,7 +648,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv,
-       cand = batadv_dat_select_candidates(bat_priv, ip, vid);
-       if (!cand)
--              goto out;
-+              return ret;
-       batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip);
-@@ -692,7 +692,6 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv,
-               batadv_orig_node_put(cand[i].orig_node);
-       }
--out:
-       kfree(cand);
-       return ret;
- }
--- 
-2.43.0
-
index cc702295f8641000eccb8506dcbeb5310702007b..303301597e4a1a56693ff1558864aa640ed654a1 100644 (file)
@@ -142,7 +142,6 @@ ata-sata_sx4-fix-pdc20621_get_from_dimm-on-64-bit.patch
 ata-sata_mv-fix-pci-device-id-table-declaration-comp.patch
 alsa-hda-realtek-update-panasonic-cf-sz6-quirk-to-support-headset-with-microphone.patch
 wifi-ath9k-fix-lna-selection-in-ath_ant_try_scan.patch
-batman-adv-return-directly-after-a-failed-batadv_dat.patch
 vmci-fix-memcpy-run-time-warning-in-dg_dispatch_as_h.patch
 arm64-dts-rockchip-fix-rk3399-hdmi-ports-node.patch
 tools-power-x86_energy_perf_policy-fix-file-leak-in-.patch
diff --git a/queue-5.10/batman-adv-improve-exception-handling-in-batadv_thro.patch b/queue-5.10/batman-adv-improve-exception-handling-in-batadv_thro.patch
deleted file mode 100644 (file)
index a8a822f..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From f21c3a842cbe852e4e3e703adf28c928de47e26f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:52:21 +0100
-Subject: batman-adv: Improve exception handling in batadv_throw_uevent()
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit 5593e9abf1cf2bf096366d8c7fd933bc69d561ce ]
-
-The kfree() function was called in up to three cases by
-the batadv_throw_uevent() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus adjust jump targets.
-
-* Reorder kfree() calls at the end.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/main.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
-index 9f267b190779f..ac3ebdba83040 100644
---- a/net/batman-adv/main.c
-+++ b/net/batman-adv/main.c
-@@ -732,29 +732,31 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
-                                 "%s%s", BATADV_UEV_TYPE_VAR,
-                                 batadv_uev_type_str[type]);
-       if (!uevent_env[0])
--              goto out;
-+              goto report_error;
-       uevent_env[1] = kasprintf(GFP_ATOMIC,
-                                 "%s%s", BATADV_UEV_ACTION_VAR,
-                                 batadv_uev_action_str[action]);
-       if (!uevent_env[1])
--              goto out;
-+              goto free_first_env;
-       /* If the event is DEL, ignore the data field */
-       if (action != BATADV_UEV_DEL) {
-               uevent_env[2] = kasprintf(GFP_ATOMIC,
-                                         "%s%s", BATADV_UEV_DATA_VAR, data);
-               if (!uevent_env[2])
--                      goto out;
-+                      goto free_second_env;
-       }
-       ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);
--out:
--      kfree(uevent_env[0]);
--      kfree(uevent_env[1]);
-       kfree(uevent_env[2]);
-+free_second_env:
-+      kfree(uevent_env[1]);
-+free_first_env:
-+      kfree(uevent_env[0]);
-       if (ret)
-+report_error:
-               batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
-                          "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
-                          batadv_uev_type_str[type],
--- 
-2.43.0
-
diff --git a/queue-5.10/batman-adv-return-directly-after-a-failed-batadv_dat.patch b/queue-5.10/batman-adv-return-directly-after-a-failed-batadv_dat.patch
deleted file mode 100644 (file)
index 2320da1..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8be77f80682c2a81fad3ba80e7c28b9a49ace237 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:27:45 +0100
-Subject: batman-adv: Return directly after a failed
- batadv_dat_select_candidates() in batadv_dat_forward_data()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit ffc15626c861f811f9778914be004fcf43810a91 ]
-
-The kfree() function was called in one case by
-the batadv_dat_forward_data() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus return directly after a batadv_dat_select_candidates() call failed
-  at the beginning.
-
-* Delete the label “out” which became unnecessary with this refactoring.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/distributed-arp-table.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
-index ddd3b4c70a516..b1cb6ecffceb9 100644
---- a/net/batman-adv/distributed-arp-table.c
-+++ b/net/batman-adv/distributed-arp-table.c
-@@ -687,7 +687,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
-       cand = batadv_dat_select_candidates(bat_priv, ip, vid);
-       if (!cand)
--              goto out;
-+              return ret;
-       batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip);
-@@ -731,7 +731,6 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
-               batadv_orig_node_put(cand[i].orig_node);
-       }
--out:
-       kfree(cand);
-       return ret;
- }
--- 
-2.43.0
-
index 6d173101120754729ef37de193ba2f5be6c51e7a..11f89105fd5c2772660b911264bd7d3c565ca2ea 100644 (file)
@@ -241,8 +241,6 @@ mptcp-don-t-account-accept-of-non-mpc-client-as-fallback-to-tcp.patch
 x86-cpufeatures-add-cpuid_lnx_5-to-track-recently-added-linux-defined-word.patch
 objtool-add-asm-version-of-stack_frame_non_standard.patch
 wifi-ath9k-fix-lna-selection-in-ath_ant_try_scan.patch
-batman-adv-return-directly-after-a-failed-batadv_dat.patch
-batman-adv-improve-exception-handling-in-batadv_thro.patch
 vmci-fix-memcpy-run-time-warning-in-dg_dispatch_as_h.patch
 panic-flush-kernel-log-buffer-at-the-end.patch
 arm64-dts-rockchip-fix-rk3328-hdmi-ports-node.patch
diff --git a/queue-5.15/batman-adv-improve-exception-handling-in-batadv_thro.patch b/queue-5.15/batman-adv-improve-exception-handling-in-batadv_thro.patch
deleted file mode 100644 (file)
index e69b5ad..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From 87b80876fb3177052479756252638482fbaf8c81 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:52:21 +0100
-Subject: batman-adv: Improve exception handling in batadv_throw_uevent()
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit 5593e9abf1cf2bf096366d8c7fd933bc69d561ce ]
-
-The kfree() function was called in up to three cases by
-the batadv_throw_uevent() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus adjust jump targets.
-
-* Reorder kfree() calls at the end.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/main.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
-index 5207cd8d6ad83..fba65c5c90bb9 100644
---- a/net/batman-adv/main.c
-+++ b/net/batman-adv/main.c
-@@ -688,29 +688,31 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
-                                 "%s%s", BATADV_UEV_TYPE_VAR,
-                                 batadv_uev_type_str[type]);
-       if (!uevent_env[0])
--              goto out;
-+              goto report_error;
-       uevent_env[1] = kasprintf(GFP_ATOMIC,
-                                 "%s%s", BATADV_UEV_ACTION_VAR,
-                                 batadv_uev_action_str[action]);
-       if (!uevent_env[1])
--              goto out;
-+              goto free_first_env;
-       /* If the event is DEL, ignore the data field */
-       if (action != BATADV_UEV_DEL) {
-               uevent_env[2] = kasprintf(GFP_ATOMIC,
-                                         "%s%s", BATADV_UEV_DATA_VAR, data);
-               if (!uevent_env[2])
--                      goto out;
-+                      goto free_second_env;
-       }
-       ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);
--out:
--      kfree(uevent_env[0]);
--      kfree(uevent_env[1]);
-       kfree(uevent_env[2]);
-+free_second_env:
-+      kfree(uevent_env[1]);
-+free_first_env:
-+      kfree(uevent_env[0]);
-       if (ret)
-+report_error:
-               batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
-                          "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
-                          batadv_uev_type_str[type],
--- 
-2.43.0
-
diff --git a/queue-5.15/batman-adv-return-directly-after-a-failed-batadv_dat.patch b/queue-5.15/batman-adv-return-directly-after-a-failed-batadv_dat.patch
deleted file mode 100644 (file)
index cdce788..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 429cc455122328225d271ae2cf8f610b0dcf95f4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:27:45 +0100
-Subject: batman-adv: Return directly after a failed
- batadv_dat_select_candidates() in batadv_dat_forward_data()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit ffc15626c861f811f9778914be004fcf43810a91 ]
-
-The kfree() function was called in one case by
-the batadv_dat_forward_data() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus return directly after a batadv_dat_select_candidates() call failed
-  at the beginning.
-
-* Delete the label “out” which became unnecessary with this refactoring.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/distributed-arp-table.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
-index 42dcdf5fd76a1..c091b2a70d22d 100644
---- a/net/batman-adv/distributed-arp-table.c
-+++ b/net/batman-adv/distributed-arp-table.c
-@@ -684,7 +684,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
-       cand = batadv_dat_select_candidates(bat_priv, ip, vid);
-       if (!cand)
--              goto out;
-+              return ret;
-       batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip);
-@@ -728,7 +728,6 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
-               batadv_orig_node_put(cand[i].orig_node);
-       }
--out:
-       kfree(cand);
-       return ret;
- }
--- 
-2.43.0
-
index 1423e4bf289c271188a0fe41c4b7c959c779ca0a..593d5611c213f2ea21eb45655a89132a89d8d48b 100644 (file)
@@ -1,7 +1,5 @@
 net-dsa-fix-panic-when-dsa-master-device-unbinds-on-shutdown.patch
 wifi-ath9k-fix-lna-selection-in-ath_ant_try_scan.patch
-batman-adv-return-directly-after-a-failed-batadv_dat.patch
-batman-adv-improve-exception-handling-in-batadv_thro.patch
 vmci-fix-memcpy-run-time-warning-in-dg_dispatch_as_h.patch
 panic-flush-kernel-log-buffer-at-the-end.patch
 cpuidle-avoid-potential-overflow-in-integer-multipli.patch
diff --git a/queue-5.4/batman-adv-improve-exception-handling-in-batadv_thro.patch b/queue-5.4/batman-adv-improve-exception-handling-in-batadv_thro.patch
deleted file mode 100644 (file)
index 4610194..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From 68e2162172df8f83a3a8a9f723c6352e12bc848f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:52:21 +0100
-Subject: batman-adv: Improve exception handling in batadv_throw_uevent()
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit 5593e9abf1cf2bf096366d8c7fd933bc69d561ce ]
-
-The kfree() function was called in up to three cases by
-the batadv_throw_uevent() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus adjust jump targets.
-
-* Reorder kfree() calls at the end.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/main.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
-index 6a183c94cdeb4..62425d19bd598 100644
---- a/net/batman-adv/main.c
-+++ b/net/batman-adv/main.c
-@@ -733,29 +733,31 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
-                                 "%s%s", BATADV_UEV_TYPE_VAR,
-                                 batadv_uev_type_str[type]);
-       if (!uevent_env[0])
--              goto out;
-+              goto report_error;
-       uevent_env[1] = kasprintf(GFP_ATOMIC,
-                                 "%s%s", BATADV_UEV_ACTION_VAR,
-                                 batadv_uev_action_str[action]);
-       if (!uevent_env[1])
--              goto out;
-+              goto free_first_env;
-       /* If the event is DEL, ignore the data field */
-       if (action != BATADV_UEV_DEL) {
-               uevent_env[2] = kasprintf(GFP_ATOMIC,
-                                         "%s%s", BATADV_UEV_DATA_VAR, data);
-               if (!uevent_env[2])
--                      goto out;
-+                      goto free_second_env;
-       }
-       ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);
--out:
--      kfree(uevent_env[0]);
--      kfree(uevent_env[1]);
-       kfree(uevent_env[2]);
-+free_second_env:
-+      kfree(uevent_env[1]);
-+free_first_env:
-+      kfree(uevent_env[0]);
-       if (ret)
-+report_error:
-               batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
-                          "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
-                          batadv_uev_type_str[type],
--- 
-2.43.0
-
diff --git a/queue-5.4/batman-adv-return-directly-after-a-failed-batadv_dat.patch b/queue-5.4/batman-adv-return-directly-after-a-failed-batadv_dat.patch
deleted file mode 100644 (file)
index dceaea7..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From f27fcbf6221bd122452855ed787af2da2e186aa4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:27:45 +0100
-Subject: batman-adv: Return directly after a failed
- batadv_dat_select_candidates() in batadv_dat_forward_data()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit ffc15626c861f811f9778914be004fcf43810a91 ]
-
-The kfree() function was called in one case by
-the batadv_dat_forward_data() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus return directly after a batadv_dat_select_candidates() call failed
-  at the beginning.
-
-* Delete the label “out” which became unnecessary with this refactoring.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/distributed-arp-table.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
-index dda62dcd59c8a..c5b7e9994a018 100644
---- a/net/batman-adv/distributed-arp-table.c
-+++ b/net/batman-adv/distributed-arp-table.c
-@@ -682,7 +682,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
-       cand = batadv_dat_select_candidates(bat_priv, ip, vid);
-       if (!cand)
--              goto out;
-+              return ret;
-       batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip);
-@@ -726,7 +726,6 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
-               batadv_orig_node_put(cand[i].orig_node);
-       }
--out:
-       kfree(cand);
-       return ret;
- }
--- 
-2.43.0
-
index 292bf3bb5f799230d9d1ea6681b5a2054f81c97a..9f728a506189cece1dd4657b7771d6cc71c77135 100644 (file)
@@ -170,8 +170,6 @@ alsa-hda-realtek-update-panasonic-cf-sz6-quirk-to-support-headset-with-microphon
 x86-mce-make-sure-to-grab-mce_sysfs_mutex-in-set_bank.patch
 s390-entry-align-system-call-table-on-8-bytes.patch
 wifi-ath9k-fix-lna-selection-in-ath_ant_try_scan.patch
-batman-adv-return-directly-after-a-failed-batadv_dat.patch
-batman-adv-improve-exception-handling-in-batadv_thro.patch
 vmci-fix-memcpy-run-time-warning-in-dg_dispatch_as_h.patch
 panic-flush-kernel-log-buffer-at-the-end.patch
 arm64-dts-rockchip-fix-rk3328-hdmi-ports-node.patch
diff --git a/queue-6.1/batman-adv-improve-exception-handling-in-batadv_thro.patch b/queue-6.1/batman-adv-improve-exception-handling-in-batadv_thro.patch
deleted file mode 100644 (file)
index b80437c..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From 554f5e367b3e57d59cf35c2683f15cf333ffb499 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:52:21 +0100
-Subject: batman-adv: Improve exception handling in batadv_throw_uevent()
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit 5593e9abf1cf2bf096366d8c7fd933bc69d561ce ]
-
-The kfree() function was called in up to three cases by
-the batadv_throw_uevent() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus adjust jump targets.
-
-* Reorder kfree() calls at the end.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/main.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
-index e8a4499155667..100e43f5e85aa 100644
---- a/net/batman-adv/main.c
-+++ b/net/batman-adv/main.c
-@@ -688,29 +688,31 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
-                                 "%s%s", BATADV_UEV_TYPE_VAR,
-                                 batadv_uev_type_str[type]);
-       if (!uevent_env[0])
--              goto out;
-+              goto report_error;
-       uevent_env[1] = kasprintf(GFP_ATOMIC,
-                                 "%s%s", BATADV_UEV_ACTION_VAR,
-                                 batadv_uev_action_str[action]);
-       if (!uevent_env[1])
--              goto out;
-+              goto free_first_env;
-       /* If the event is DEL, ignore the data field */
-       if (action != BATADV_UEV_DEL) {
-               uevent_env[2] = kasprintf(GFP_ATOMIC,
-                                         "%s%s", BATADV_UEV_DATA_VAR, data);
-               if (!uevent_env[2])
--                      goto out;
-+                      goto free_second_env;
-       }
-       ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);
--out:
--      kfree(uevent_env[0]);
--      kfree(uevent_env[1]);
-       kfree(uevent_env[2]);
-+free_second_env:
-+      kfree(uevent_env[1]);
-+free_first_env:
-+      kfree(uevent_env[0]);
-       if (ret)
-+report_error:
-               batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
-                          "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
-                          batadv_uev_type_str[type],
--- 
-2.43.0
-
diff --git a/queue-6.1/batman-adv-return-directly-after-a-failed-batadv_dat.patch b/queue-6.1/batman-adv-return-directly-after-a-failed-batadv_dat.patch
deleted file mode 100644 (file)
index 4453dec..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From f99d284ea3834e000ae1a7bacdae73e1ac9334e6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:27:45 +0100
-Subject: batman-adv: Return directly after a failed
- batadv_dat_select_candidates() in batadv_dat_forward_data()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit ffc15626c861f811f9778914be004fcf43810a91 ]
-
-The kfree() function was called in one case by
-the batadv_dat_forward_data() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus return directly after a batadv_dat_select_candidates() call failed
-  at the beginning.
-
-* Delete the label “out” which became unnecessary with this refactoring.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/distributed-arp-table.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
-index a0233252032dc..521d4952eb515 100644
---- a/net/batman-adv/distributed-arp-table.c
-+++ b/net/batman-adv/distributed-arp-table.c
-@@ -684,7 +684,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
-       cand = batadv_dat_select_candidates(bat_priv, ip, vid);
-       if (!cand)
--              goto out;
-+              return ret;
-       batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip);
-@@ -728,7 +728,6 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
-               batadv_orig_node_put(cand[i].orig_node);
-       }
--out:
-       kfree(cand);
-       return ret;
- }
--- 
-2.43.0
-
index 9bbf726407bb8fae457cb4a5b3b52d25183d4a25..8e7c218db1bd530ac95bce84c10d39fdbeceec72 100644 (file)
@@ -1,7 +1,5 @@
 wifi-ath9k-fix-lna-selection-in-ath_ant_try_scan.patch
 bnx2x-fix-firmware-version-string-character-counts.patch
-batman-adv-return-directly-after-a-failed-batadv_dat.patch
-batman-adv-improve-exception-handling-in-batadv_thro.patch
 wifi-rtw89-pci-enlarge-rx-dma-buffer-to-consider-siz.patch
 vmci-fix-memcpy-run-time-warning-in-dg_dispatch_as_h.patch
 wifi-iwlwifi-pcie-add-the-pci-device-id-for-new-hard.patch
diff --git a/queue-6.6/batman-adv-improve-exception-handling-in-batadv_thro.patch b/queue-6.6/batman-adv-improve-exception-handling-in-batadv_thro.patch
deleted file mode 100644 (file)
index 6c7ebec..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From bfacd50a1e48163a1f9a6a5188cc267038b14edd Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:52:21 +0100
-Subject: batman-adv: Improve exception handling in batadv_throw_uevent()
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit 5593e9abf1cf2bf096366d8c7fd933bc69d561ce ]
-
-The kfree() function was called in up to three cases by
-the batadv_throw_uevent() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus adjust jump targets.
-
-* Reorder kfree() calls at the end.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/main.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
-index e8a4499155667..100e43f5e85aa 100644
---- a/net/batman-adv/main.c
-+++ b/net/batman-adv/main.c
-@@ -688,29 +688,31 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
-                                 "%s%s", BATADV_UEV_TYPE_VAR,
-                                 batadv_uev_type_str[type]);
-       if (!uevent_env[0])
--              goto out;
-+              goto report_error;
-       uevent_env[1] = kasprintf(GFP_ATOMIC,
-                                 "%s%s", BATADV_UEV_ACTION_VAR,
-                                 batadv_uev_action_str[action]);
-       if (!uevent_env[1])
--              goto out;
-+              goto free_first_env;
-       /* If the event is DEL, ignore the data field */
-       if (action != BATADV_UEV_DEL) {
-               uevent_env[2] = kasprintf(GFP_ATOMIC,
-                                         "%s%s", BATADV_UEV_DATA_VAR, data);
-               if (!uevent_env[2])
--                      goto out;
-+                      goto free_second_env;
-       }
-       ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);
--out:
--      kfree(uevent_env[0]);
--      kfree(uevent_env[1]);
-       kfree(uevent_env[2]);
-+free_second_env:
-+      kfree(uevent_env[1]);
-+free_first_env:
-+      kfree(uevent_env[0]);
-       if (ret)
-+report_error:
-               batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
-                          "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
-                          batadv_uev_type_str[type],
--- 
-2.43.0
-
diff --git a/queue-6.6/batman-adv-return-directly-after-a-failed-batadv_dat.patch b/queue-6.6/batman-adv-return-directly-after-a-failed-batadv_dat.patch
deleted file mode 100644 (file)
index 2706a1e..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From f765804dc16e11c3dc4fe975801a4b0cea1b7c16 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:27:45 +0100
-Subject: batman-adv: Return directly after a failed
- batadv_dat_select_candidates() in batadv_dat_forward_data()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit ffc15626c861f811f9778914be004fcf43810a91 ]
-
-The kfree() function was called in one case by
-the batadv_dat_forward_data() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus return directly after a batadv_dat_select_candidates() call failed
-  at the beginning.
-
-* Delete the label “out” which became unnecessary with this refactoring.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/distributed-arp-table.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
-index 28a939d560906..4c7e855343245 100644
---- a/net/batman-adv/distributed-arp-table.c
-+++ b/net/batman-adv/distributed-arp-table.c
-@@ -684,7 +684,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
-       cand = batadv_dat_select_candidates(bat_priv, ip, vid);
-       if (!cand)
--              goto out;
-+              return ret;
-       batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip);
-@@ -728,7 +728,6 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
-               batadv_orig_node_put(cand[i].orig_node);
-       }
--out:
-       kfree(cand);
-       return ret;
- }
--- 
-2.43.0
-
index 5dad04b0821e9f14577922823e1e5bcee6a93132..085157c957330ad88984eeec998111c0c62fed4b 100644 (file)
@@ -1,8 +1,6 @@
 wifi-ath9k-fix-lna-selection-in-ath_ant_try_scan.patch
 wifi-rtw89-fix-null-pointer-access-when-abort-scan.patch
 bnx2x-fix-firmware-version-string-character-counts.patch
-batman-adv-return-directly-after-a-failed-batadv_dat.patch
-batman-adv-improve-exception-handling-in-batadv_thro.patch
 net-stmmac-dwmac-starfive-add-support-for-jh7100-soc.patch
 net-phy-phy_device-prevent-nullptr-exceptions-on-isr.patch
 wifi-rtw89-pci-enlarge-rx-dma-buffer-to-consider-siz.patch
diff --git a/queue-6.8/batman-adv-improve-exception-handling-in-batadv_thro.patch b/queue-6.8/batman-adv-improve-exception-handling-in-batadv_thro.patch
deleted file mode 100644 (file)
index 611b82b..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From c86f2e47765ebbd6cf332b5174fa855d9967a405 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:52:21 +0100
-Subject: batman-adv: Improve exception handling in batadv_throw_uevent()
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit 5593e9abf1cf2bf096366d8c7fd933bc69d561ce ]
-
-The kfree() function was called in up to three cases by
-the batadv_throw_uevent() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus adjust jump targets.
-
-* Reorder kfree() calls at the end.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/main.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
-index 5fc754b0b3f7f..75119f1ffcccf 100644
---- a/net/batman-adv/main.c
-+++ b/net/batman-adv/main.c
-@@ -691,29 +691,31 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
-                                 "%s%s", BATADV_UEV_TYPE_VAR,
-                                 batadv_uev_type_str[type]);
-       if (!uevent_env[0])
--              goto out;
-+              goto report_error;
-       uevent_env[1] = kasprintf(GFP_ATOMIC,
-                                 "%s%s", BATADV_UEV_ACTION_VAR,
-                                 batadv_uev_action_str[action]);
-       if (!uevent_env[1])
--              goto out;
-+              goto free_first_env;
-       /* If the event is DEL, ignore the data field */
-       if (action != BATADV_UEV_DEL) {
-               uevent_env[2] = kasprintf(GFP_ATOMIC,
-                                         "%s%s", BATADV_UEV_DATA_VAR, data);
-               if (!uevent_env[2])
--                      goto out;
-+                      goto free_second_env;
-       }
-       ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);
--out:
--      kfree(uevent_env[0]);
--      kfree(uevent_env[1]);
-       kfree(uevent_env[2]);
-+free_second_env:
-+      kfree(uevent_env[1]);
-+free_first_env:
-+      kfree(uevent_env[0]);
-       if (ret)
-+report_error:
-               batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
-                          "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
-                          batadv_uev_type_str[type],
--- 
-2.43.0
-
diff --git a/queue-6.8/batman-adv-return-directly-after-a-failed-batadv_dat.patch b/queue-6.8/batman-adv-return-directly-after-a-failed-batadv_dat.patch
deleted file mode 100644 (file)
index 9c2340c..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8253cc06e0c3fdbcc5857da6f3ea00b390d35457 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jan 2024 07:27:45 +0100
-Subject: batman-adv: Return directly after a failed
- batadv_dat_select_candidates() in batadv_dat_forward_data()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit ffc15626c861f811f9778914be004fcf43810a91 ]
-
-The kfree() function was called in one case by
-the batadv_dat_forward_data() function during error handling
-even if the passed variable contained a null pointer.
-This issue was detected by using the Coccinelle software.
-
-* Thus return directly after a batadv_dat_select_candidates() call failed
-  at the beginning.
-
-* Delete the label “out” which became unnecessary with this refactoring.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Acked-by: Sven Eckelmann <sven@narfation.org>
-Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/batman-adv/distributed-arp-table.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
-index 28a939d560906..4c7e855343245 100644
---- a/net/batman-adv/distributed-arp-table.c
-+++ b/net/batman-adv/distributed-arp-table.c
-@@ -684,7 +684,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
-       cand = batadv_dat_select_candidates(bat_priv, ip, vid);
-       if (!cand)
--              goto out;
-+              return ret;
-       batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip);
-@@ -728,7 +728,6 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
-               batadv_orig_node_put(cand[i].orig_node);
-       }
--out:
-       kfree(cand);
-       return ret;
- }
--- 
-2.43.0
-
index 385a58533be92637081c43e45b3e3a6e476eba9b..653478e8fb836ca208e0c3e07f2b9eb587aa7239 100644 (file)
@@ -1,8 +1,6 @@
 wifi-ath9k-fix-lna-selection-in-ath_ant_try_scan.patch
 wifi-rtw89-fix-null-pointer-access-when-abort-scan.patch
 bnx2x-fix-firmware-version-string-character-counts.patch
-batman-adv-return-directly-after-a-failed-batadv_dat.patch
-batman-adv-improve-exception-handling-in-batadv_thro.patch
 net-stmmac-dwmac-starfive-add-support-for-jh7100-soc.patch
 net-phy-phy_device-prevent-nullptr-exceptions-on-isr.patch
 wifi-rtw89-pci-validate-rx-tag-for-rxq-and-rpq.patch