Skip to content

Commit 5044911

Browse files
nastya-nizharadzegregkh
authored andcommitted
net: Fix an unsafe loop on the list
commit 1dae9f1 upstream. The kernel may crash when deleting a genetlink family if there are still listeners for that family: Oops: Kernel access of bad area, sig: 11 [#1] ... NIP [c000000000c080bc] netlink_update_socket_mc+0x3c/0xc0 LR [c000000000c0f764] __netlink_clear_multicast_users+0x74/0xc0 Call Trace: __netlink_clear_multicast_users+0x74/0xc0 genl_unregister_family+0xd4/0x2d0 Change the unsafe loop on the list to a safe one, because inside the loop there is an element removal from this list. Fixes: b827357 ("genetlink: fix netns vs. netlink table locking (2)") Cc: stable@vger.kernel.org Signed-off-by: Anastasia Kovaleva <a.kovaleva@yadro.com> Reviewed-by: Dmitry Bogdanov <d.bogdanov@yadro.com> Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com> Link: https://patch.msgid.link/20241003104431.12391-1-a.kovaleva@yadro.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c75afaf commit 5044911

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

include/net/sock.h

+2
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static inline void sk_add_bind_node(struct sock *sk,
764764
hlist_for_each_entry_safe(__sk, tmp, list, sk_node)
765765
#define sk_for_each_bound(__sk, list) \
766766
hlist_for_each_entry(__sk, list, sk_bind_node)
767+
#define sk_for_each_bound_safe(__sk, tmp, list) \
768+
hlist_for_each_entry_safe(__sk, tmp, list, sk_bind_node)
767769

768770
/**
769771
* sk_for_each_entry_offset_rcu - iterate over a list at a given struct offset

net/netlink/af_netlink.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -2145,8 +2145,9 @@ void __netlink_clear_multicast_users(struct sock *ksk, unsigned int group)
21452145
{
21462146
struct sock *sk;
21472147
struct netlink_table *tbl = &nl_table[ksk->sk_protocol];
2148+
struct hlist_node *tmp;
21482149

2149-
sk_for_each_bound(sk, &tbl->mc_list)
2150+
sk_for_each_bound_safe(sk, tmp, &tbl->mc_list)
21502151
netlink_update_socket_mc(nlk_sk(sk), group, 0);
21512152
}
21522153

0 commit comments

Comments
 (0)