Unverified Commit 8c4bf66e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14521 netlink: terminate outstanding dump on socket close 

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

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents bedee5b4 2d0aa3fd

net/netlink/af_netlink.c

+8 −23
Original line number Diff line number Diff line
@@ -393,15 +393,6 @@ static void netlink_skb_set_owner_r(struct sk_buff *skb, struct sock *sk) 


static void netlink_sock_destruct(struct sock *sk)

{

	struct netlink_sock *nlk = nlk_sk(sk);



	if (nlk->cb_running) {

		if (nlk->cb.done)

			nlk->cb.done(&nlk->cb);

		module_put(nlk->cb.module);

		kfree_skb(nlk->cb.skb);

	}



	skb_queue_purge(&sk->sk_receive_queue);



	if (!sock_flag(sk, SOCK_DEAD)) {
@@ -414,14 +405,6 @@ static void netlink_sock_destruct(struct sock *sk) 
	WARN_ON(nlk_sk(sk)->groups);

}



static void netlink_sock_destruct_work(struct work_struct *work)

{

	struct netlink_sock *nlk = container_of(work, struct netlink_sock,

						work);



	sk_free(&nlk->sk);

}



/* This lock without WQ_FLAG_EXCLUSIVE is good on UP and it is _very_ bad on

 * SMP. Look, when several writers sleep and reader wakes them up, all but one

 * immediately hit write lock and grab all the cpus. Exclusive sleep solves
@@ -738,12 +721,6 @@ static void deferred_put_nlk_sk(struct rcu_head *head) 
	if (!refcount_dec_and_test(&sk->sk_refcnt))

		return;



	if (nlk->cb_running && nlk->cb.done) {

		INIT_WORK(&nlk->work, netlink_sock_destruct_work);

		schedule_work(&nlk->work);

		return;

	}



	sk_free(sk);

}
@@ -793,6 +770,14 @@ static int netlink_release(struct socket *sock) 
				NETLINK_URELEASE, &n);

	}



	/* Terminate any outstanding dump */

	if (nlk->cb_running) {

		if (nlk->cb.done)

			nlk->cb.done(&nlk->cb);

		module_put(nlk->cb.module);

		kfree_skb(nlk->cb.skb);

	}



	module_put(nlk->module);



	if (netlink_is_kernel(sk)) {

net/netlink/af_netlink.h

+0 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


#include <linux/rhashtable.h>

#include <linux/atomic.h>

#include <linux/workqueue.h>

#include <net/sock.h>



/* flags */
@@ -45,7 +44,6 @@ struct netlink_sock { 


	struct rhash_head	node;

	struct rcu_head		rcu;

	struct work_struct	work;

};



static inline struct netlink_sock *nlk_sk(struct sock *sk)