Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1428934

[PATCH net-next 01/14] rxrpc: checking for IS_ERR() instead of NULL [ver #2]

Show all headers | View raw

From: Dan Carpenter <dan.carpenter@oracle.com>

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: be6e6707f6ee ('rxrpc: Rework peer object handling to use hash table and RCU')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David Howells <dhowells@redhat.com>
---

 net/rxrpc/af_rxrpc.c    |    4 ++--
 net/rxrpc/call_accept.c |    2 +-
 net/rxrpc/input.c       |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index c83c3c75d665..9dd160bb16d2 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -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);
diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c
index 50136c76ebd1..553b67c144e5 100644
--- a/net/rxrpc/call_accept.c
+++ b/net/rxrpc/call_accept.c
@@ -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;
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
index 47fb167af3e4..e11e4d785127 100644
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@ -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);

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH net-next 00/14] rxrpc: Get rid of conn bundle and transport  structs [ver #2] David Howells <dhowells@redhat.com> - 2016-06-22 18:10 +0200
  [PATCH net-next 01/14] rxrpc: checking for IS_ERR() instead of NULL  [ver #2] David Howells <dhowells@redhat.com> - 2016-06-22 18:10 +0200
  [PATCH net-next 02/14] rxrpc: fix uninitialized variable use [ver  #2] David Howells <dhowells@redhat.com> - 2016-06-22 18:10 +0200
  [PATCH net-next 05/14] rxrpc: Fix exclusive connection handling  [ver #2] David Howells <dhowells@redhat.com> - 2016-06-22 18:10 +0200
  [PATCH net-next 04/14] rxrpc: Replace conn->trans->{local,  peer} with conn->params.{local, peer} [ver #2] David Howells <dhowells@redhat.com> - 2016-06-22 18:10 +0200
  [PATCH net-next 12/14] rxrpc: Provide more refcount helper  functions [ver #2] David Howells <dhowells@redhat.com> - 2016-06-22 18:10 +0200
  Re: [PATCH net-next 00/14] rxrpc: Get rid of conn bundle and transport structs [ver #2] David Howells <dhowells@redhat.com> - 2016-06-22 18:10 +0200
  [PATCH net-next 06/14] rxrpc: Pass sk_buff * rather than  rxrpc_host_header * to functions [ver #2] David Howells <dhowells@redhat.com> - 2016-06-22 18:10 +0200
  [PATCH net-next 14/14] rxrpc: Kill off the rxrpc_transport struct  [ver #2] David Howells <dhowells@redhat.com> - 2016-06-22 18:10 +0200
  [PATCH net-next 11/14] rxrpc: Make rxrpc_send_packet() take a  connection not a transport [ver #2] David Howells <dhowells@redhat.com> - 2016-06-22 18:20 +0200
  [PATCH net-next 10/14] rxrpc: Calls displayed in /proc may in  future lack a connection [ver #2] David Howells <dhowells@redhat.com> - 2016-06-22 18:20 +0200

csiph-web