From: Xin Long Date: Thu, 15 Dec 2016 15:05:52 +0000 (+0800) Subject: sctp: sctp_transport_lookup_process should rcu_read_unlock when transport is null X-Git-Tag: v4.10-rc1~55^2~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08abb79542c9e8c367d1d8e44fe1026868d3f0a7;p=thirdparty%2Fkernel%2Flinux.git 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 Acked-by: Marcelo Ricardo Leitner Signed-off-by: David S. Miller --- diff --git a/net/sctp/socket.c b/net/sctp/socket.c index d5f4b4a8369bc..318c6786d6539 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);