Skip to content

Commit

Permalink
sctp: sctp_transport_lookup_process should rcu_read_unlock when trans…
Browse files Browse the repository at this point in the history
…port is null

Prior to this patch, sctp_transport_lookup_process didn't rcu_read_unlock
when it failed to find a transport by sctp_addrs_lookup_transport.

This patch is to fix it by moving up rcu_read_unlock right before checking
transport and also to remove the out path.

Fixes: 1cceda7 ("sctp: fix the issue sctp_diag uses lock_sock in rcu_read_lock")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Xin Long authored and David S. Miller committed Dec 17, 2016
1 parent 5cb2cd6 commit 08abb79
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions net/sctp/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -4472,18 +4472,17 @@ int sctp_transport_lookup_process(int (*cb)(struct sctp_transport *, void *),
const union sctp_addr *paddr, void *p)
{
struct sctp_transport *transport;
int err = -ENOENT;
int err;

rcu_read_lock();
transport = sctp_addrs_lookup_transport(net, laddr, paddr);
rcu_read_unlock();
if (!transport)
goto out;
return -ENOENT;

rcu_read_unlock();
err = cb(transport, p);
sctp_transport_put(transport);

out:
return err;
}
EXPORT_SYMBOL_GPL(sctp_transport_lookup_process);
Expand Down

0 comments on commit 08abb79

Please sign in to comment.