netdev - [PATCH bpf-next] bpf, sockmap: Simplify iteration on link removal

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20250307-sockmap-del-link-cleanup-v1-1-a042364bbeb1@rbox.co>
Date: Fri, 07 Mar 2025 11:16:12 +0100
From: Michal Luczaj <mhal@...x.co>
To: John Fastabend <john.fastabend@...il.com>, 
 Jakub Sitnicki <jakub@...udflare.com>, 
 "David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, 
 Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, 
 Simon Horman <horms@...nel.org>
Cc: netdev@...r.kernel.org, bpf@...r.kernel.org, 
 Michal Luczaj <mhal@...x.co>
Subject: [PATCH bpf-next] bpf, sockmap: Simplify iteration on link removal

Since commit 75e072a390da ("bpf, sockmap: Fix update element with same"),
using the _safe variant of list_for_each_entry() is unnecessary.

Simplify the loop.

Signed-off-by: Michal Luczaj <mhal@...x.co>
---
 net/core/sock_map.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index 82a14f131d00c604f1dfa51e51563aeacda44198..b89d42f7ba702badd5b00c6329e3c9eea8ed4fd3 100644
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -143,10 +143,10 @@ static void sock_map_del_link(struct sock *sk,
 			      struct sk_psock *psock, void *link_raw)
 {
 	bool strp_stop = false, verdict_stop = false;
-	struct sk_psock_link *link, *tmp;
+	struct sk_psock_link *link;

 	spin_lock_bh(&psock->link_lock);
-	list_for_each_entry_safe(link, tmp, &psock->link, list) {
+	list_for_each_entry(link, &psock->link, list) {
 		if (link->link_raw == link_raw) {
 			struct bpf_map *map = link->map;
 			struct sk_psock_progs *progs = sock_map_progs(map);

---
base-commit: 433873f9e6dad71f1d9a0d4966bfe92d26809dbd
change-id: 20250212-sockmap-del-link-cleanup-208ca01ba2f7

Best regards,
-- 
Michal Luczaj <mhal@...x.co>