Unverified Commit 9c8d7045 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15432 CVE-2022-49087 

Merge Pull Request from: @ci-robot 
 
PR sync from: Cai Xinchen <caixinchen1@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/YM5JC62IQMFRAF2TM7NWUQTT4SIW4GCB/ 
David Howells (1):
  rxrpc: Restore removed timer deletion

Eric Dumazet (1):
  rxrpc: fix a race in rxrpc_exit_net()

 
https://gitee.com/src-openeuler/kernel/issues/IBP6Y3 
 
Link:https://gitee.com/openeuler/kernel/pulls/15432

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 9fa7384d d85d7382

net/rxrpc/net_ns.c

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ static __net_exit void rxrpc_exit_net(struct net *net) 
	rxnet->live = false;

	del_timer_sync(&rxnet->peer_keepalive_timer);

	cancel_work_sync(&rxnet->peer_keepalive_work);

	/* Remove the timer again as the worker may have restarted it. */

	del_timer_sync(&rxnet->peer_keepalive_timer);

	rxrpc_destroy_all_calls(rxnet);

	rxrpc_destroy_all_connections(rxnet);

	rxrpc_destroy_all_peers(rxnet);