diff options
author | Xin Long <lucien.xin@gmail.com> | 2016-12-15 10:05:52 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-15 07:42:52 -0500 |
commit | ed3cc329c7bc82c0f29735d81b26f96287dbe08a (patch) | |
tree | 01c690784cb645dbe400a5f8c3584e623836cf5c | |
parent | 8b8fbe5c25abcdc93fcb91c896c40452ca9789a3 (diff) |
sctp: sctp_transport_lookup_process should rcu_read_unlock when transport is null
[ Upstream commit 08abb79542c9e8c367d1d8e44fe1026868d3f0a7 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | net/sctp/socket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index f23ad913dc7a..ca12aa346c0d 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -4479,9 +4479,10 @@ int sctp_transport_lookup_process(int (*cb)(struct sctp_transport *, void *), | |||
4479 | 4479 | ||
4480 | rcu_read_lock(); | 4480 | rcu_read_lock(); |
4481 | transport = sctp_addrs_lookup_transport(net, laddr, paddr); | 4481 | transport = sctp_addrs_lookup_transport(net, laddr, paddr); |
4482 | if (!transport || !sctp_transport_hold(transport)) | 4482 | if (!transport || !sctp_transport_hold(transport)) { |
4483 | rcu_read_unlock(); | ||
4483 | goto out; | 4484 | goto out; |
4484 | 4485 | } | |
4485 | rcu_read_unlock(); | 4486 | rcu_read_unlock(); |
4486 | err = cb(transport, p); | 4487 | err = cb(transport, p); |
4487 | sctp_transport_put(transport); | 4488 | sctp_transport_put(transport); |