drop useless batman patches

3 files changed, 0 insertions, 128 deletions

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
index 4610194423..0000000000
--- a/queue-5.4/batman-adv-improve-exception-handling-in-batadv_thro.patch
+++ /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
index dceaea7078..0000000000
--- a/queue-5.4/batman-adv-return-directly-after-a-failed-batadv_dat.patch
+++ /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
-
diff --git a/queue-5.4/series b/queue-5.4/series
index 292bf3bb5f..9f728a5061 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -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