Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e4699e4 authored by Dan Carpenter's avatar Dan Carpenter Committed by David Howells
Browse files

rxrpc: checking for IS_ERR() instead of NULL 



rxrpc_lookup_peer_rcu() and rxrpc_lookup_peer() return NULL on error, never
error pointers, so IS_ERR() can't be used.

Fix three callers of those functions.

Fixes: be6e6707 ('rxrpc: Rework peer object handling to use hash table and RCU')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 0e9390eb

net/rxrpc/af_rxrpc.c

+2 −2
Original line number Diff line number Diff line
@@ -247,8 +247,8 @@ struct rxrpc_transport *rxrpc_name_to_transport(struct rxrpc_sock *rx, 


	/* find a remote transport endpoint from the local one */

	peer = rxrpc_lookup_peer(rx->local, srx, gfp);

	if (IS_ERR(peer))

		return ERR_CAST(peer);

	if (!peer)

		return ERR_PTR(-ENOMEM);



	/* find a transport */

	trans = rxrpc_get_transport(rx->local, peer, gfp);

net/rxrpc/call_accept.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int rxrpc_accept_incoming_call(struct rxrpc_local *local, 
	notification->mark = RXRPC_SKB_MARK_NEW_CALL;



	peer = rxrpc_lookup_peer(local, srx, GFP_NOIO);

	if (IS_ERR(peer)) {

	if (!peer) {

		_debug("no peer");

		ret = -EBUSY;

		goto error;

net/rxrpc/input.c

+1 −1
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ static struct rxrpc_connection *rxrpc_conn_from_local(struct rxrpc_local *local, 
	rxrpc_get_addr_from_skb(local, skb, &srx);

	rcu_read_lock();

	peer = rxrpc_lookup_peer_rcu(local, &srx);

	if (IS_ERR(peer))

	if (!peer)

		goto cant_find_peer;



	trans = rxrpc_find_transport(local, peer);