diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-12-07 08:25:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-07 17:07:33 -0500 |
| commit | 69ce6487dcd364245a3d26322fc8f4ffd1e8d947 (patch) | |
| tree | d7ea3b21a69301c7d3ea0a61ab4a026affcb4ed2 /net/sctp/ipv6.c | |
| parent | ce212d0f6f5523ca9eb8020267f1aa4eb6869ba8 (diff) | |
| download | blackbird-op-linux-69ce6487dcd364245a3d26322fc8f4ffd1e8d947.tar.gz blackbird-op-linux-69ce6487dcd364245a3d26322fc8f4ffd1e8d947.zip | |
ipv6: sctp: fix lockdep splat in sctp_v6_get_dst()
While cooking the sctp np->opt rcu fixes, I forgot to move
one rcu_read_unlock() after the added rcu_dereference() in
sctp_v6_get_dst()
This gave lockdep warnings reported by Dave Jones.
Fixes: c836a8ba9386 ("ipv6: sctp: add rcu protection around np->opt")
Reported-by: Dave Jones <davej@codemonkey.org.uk>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/ipv6.c')
| -rw-r--r-- | net/sctp/ipv6.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index acb45b8c2a9d..d28c0b4c9128 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -323,14 +323,13 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, } } } - rcu_read_unlock(); - if (baddr) { fl6->saddr = baddr->v6.sin6_addr; fl6->fl6_sport = baddr->v6.sin6_port; final_p = fl6_update_dst(fl6, rcu_dereference(np->opt), &final); dst = ip6_dst_lookup_flow(sk, fl6, final_p); } + rcu_read_unlock(); out: if (!IS_ERR_OR_NULL(dst)) { |
