Commit 5008d77e authored by Richard Laing's avatar Richard Laing Committed by Greg Kroah-Hartman

net/ipv6: Correct PIM6 mrt_lock handling

[ Upstream commit 25b4a44c ]

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: default avatarRichard Laing <richard.laing@alliedtelesis.co.nz>
Acked-by: default avatarCong Wang <cwang@twopensource.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8bb9225a
...@@ -550,7 +550,7 @@ static void ipmr_mfc_seq_stop(struct seq_file *seq, void *v) ...@@ -550,7 +550,7 @@ static void ipmr_mfc_seq_stop(struct seq_file *seq, void *v)
if (it->cache == &mrt->mfc6_unres_queue) if (it->cache == &mrt->mfc6_unres_queue)
spin_unlock_bh(&mfc_unres_lock); 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); read_unlock(&mrt_lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment