Unverified Commit 60a1c16b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13932 net: Fix an unsafe loop on the list 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RO7QV7U5DGK6NDBQMGWET2E2EKOFADJN/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRDW 
 
Link:https://gitee.com/openeuler/kernel/pulls/13932

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 7d9f526f 56db004a

include/net/sock.h

+2 −0
Original line number Diff line number Diff line
@@ -857,6 +857,8 @@ static inline void sk_add_bind_node(struct sock *sk, 
	hlist_for_each_entry_safe(__sk, tmp, list, sk_node)

#define sk_for_each_bound(__sk, list) \

	hlist_for_each_entry(__sk, list, sk_bind_node)

#define sk_for_each_bound_safe(__sk, tmp, list) \

	hlist_for_each_entry_safe(__sk, tmp, list, sk_bind_node)



/**

 * sk_for_each_entry_offset_rcu - iterate over a list at a given struct offset

net/netlink/af_netlink.c

+2 −1
Original line number Diff line number Diff line
@@ -2155,8 +2155,9 @@ void __netlink_clear_multicast_users(struct sock *ksk, unsigned int group) 
{

	struct sock *sk;

	struct netlink_table *tbl = &nl_table[ksk->sk_protocol];

	struct hlist_node *tmp;



	sk_for_each_bound(sk, &tbl->mc_list)

	sk_for_each_bound_safe(sk, tmp, &tbl->mc_list)

		netlink_update_socket_mc(nlk_sk(sk), group, 0);

}