Unverified Commit 2e920fea authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8603 rxrpc: Fix rxrpc_local leak in rxrpc_lookup_peer() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Chuang <liuchuang40@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/P7V4XX6JFA5OVXM7EDK7S2O5LSAAFBZF/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9S23H 
 
Link:https://gitee.com/openeuler/kernel/pulls/8603

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 23ae7e1b 5cbfb7fa

net/rxrpc/peer_object.c

+9 −5
Original line number Diff line number Diff line
@@ -299,6 +299,12 @@ static struct rxrpc_peer *rxrpc_create_peer(struct rxrpc_sock *rx, 
	return peer;

}



static void rxrpc_free_peer(struct rxrpc_peer *peer)

{

	rxrpc_put_local(peer->local);

	kfree_rcu(peer, rcu);

}



/*

 * Set up a new incoming peer.  There shouldn't be any other matching peers

 * since we've already done a search in the list from the non-reentrant context
@@ -365,7 +371,7 @@ struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_sock *rx, 
		spin_unlock_bh(&rxnet->peer_hash_lock);



		if (peer)

			kfree(candidate);

			rxrpc_free_peer(candidate);

		else

			peer = candidate;

	}
@@ -420,8 +426,7 @@ static void __rxrpc_put_peer(struct rxrpc_peer *peer) 
	list_del_init(&peer->keepalive_link);

	spin_unlock_bh(&rxnet->peer_hash_lock);



	rxrpc_put_local(peer->local);

	kfree_rcu(peer, rcu);

	rxrpc_free_peer(peer);

}



/*
@@ -457,8 +462,7 @@ void rxrpc_put_peer_locked(struct rxrpc_peer *peer) 
	if (n == 0) {

		hash_del_rcu(&peer->hash_link);

		list_del_init(&peer->keepalive_link);

		rxrpc_put_local(peer->local);

		kfree_rcu(peer, rcu);

		rxrpc_free_peer(peer);

	}

}