diff options
| author | Richard Laing <richard.laing@alliedtelesis.co.nz> | 2015-09-03 03:52:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-06 02:31:30 +0200 |
| commit | 25b4a44c19c83d98e8c0807a7ede07c1f28eab8b (patch) | |
| tree | 94f5ebf5140c803c584e6de36b47f5b619595196 /net/ipv6/ip6mr.c | |
| parent | Merge branch 'sctp-fixes' (diff) | |
| download | linux-25b4a44c19c83d98e8c0807a7ede07c1f28eab8b.tar.xz linux-25b4a44c19c83d98e8c0807a7ede07c1f28eab8b.zip | |
net/ipv6: Correct PIM6 mrt_lock handling
In the IPv6 multicast routing code the mrt_lock was not being released
correctly in the MFC iterator, as a result adding or deleting a MIF would
cause a hang because the mrt_lock could not be acquired.
This fix is a copy of the code for the IPv4 case and ensures that the lock
is released correctly.
Signed-off-by: Richard Laing <richard.laing@alliedtelesis.co.nz>
Acked-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 74ceb73c1c9a..5f36266b1f5e 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -550,7 +550,7 @@ static void ipmr_mfc_seq_stop(struct seq_file *seq, void *v) if (it->cache == &mrt->mfc6_unres_queue) spin_unlock_bh(&mfc_unres_lock); - else if (it->cache == mrt->mfc6_cache_array) + else if (it->cache == &mrt->mfc6_cache_array[it->ct]) read_unlock(&mrt_lock); } |