From: Jakub Sitnicki jakub@cloudflare.com
mainline inclusion from mainline-v6.10-rc2 commit 3b9ce0491a43e9af7f108b2f1bced7cd35931660 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9QG7M CVE: CVE-2024-35895
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
---------------------------
This reverts commit ff91059932401894e6c86341915615c5eb0eca48.
This check is no longer needed. BPF programs attached to tracepoints are now rejected by the verifier when they attempt to delete from a sockmap/sockhash maps.
Signed-off-by: Jakub Sitnicki jakub@cloudflare.com Signed-off-by: Daniel Borkmann daniel@iogearbox.net Acked-by: John Fastabend john.fastabend@gmail.com Link: https://lore.kernel.org/bpf/20240527-sockmap-verify-deletes-v1-2-944b372f210...
Conflicts: net/core/sock_map.c [This is because we did not backport 35d2b7ffffc1.] Signed-off-by: Liu Jian liujian56@huawei.com --- net/core/sock_map.c | 6 ------ 1 file changed, 6 deletions(-)
diff --git a/net/core/sock_map.c b/net/core/sock_map.c index a85fd7757222..c7900283eebb 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -434,9 +434,6 @@ static int __sock_map_delete(struct bpf_stab *stab, struct sock *sk_test, struct sock *sk; int err = 0;
- if (irqs_disabled()) - return -EOPNOTSUPP; /* locks here are hardirq-unsafe */ - raw_spin_lock_bh(&stab->lock); sk = *psk; if (!sk_test || sk_test == sk) @@ -970,9 +967,6 @@ static int sock_hash_delete_elem(struct bpf_map *map, void *key) struct bpf_shtab_elem *elem; int ret = -ENOENT;
- if (irqs_disabled()) - return -EOPNOTSUPP; /* locks here are hardirq-unsafe */ - hash = sock_hash_bucket_hash(key, key_size); bucket = sock_hash_select_bucket(htab, hash);