diff options
| author | Xin Long <lucien.xin@gmail.com> | 2016-12-15 16:05:52 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-17 17:43:23 +0100 |
| commit | 08abb79542c9e8c367d1d8e44fe1026868d3f0a7 (patch) | |
| tree | 332e55af950dbf914c4fcac02936da59eb9be94b /net | |
| parent | sctp: sctp_epaddr_lookup_transport should be protected by rcu_read_lock (diff) | |
| download | linux-08abb79542c9e8c367d1d8e44fe1026868d3f0a7.tar.xz linux-08abb79542c9e8c367d1d8e44fe1026868d3f0a7.zip | |
sctp: sctp_transport_lookup_process should rcu_read_unlock when transport 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: 1cceda784980 ("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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sctp/socket.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index d5f4b4a8369b..318c6786d653 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -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); |