From: Richard Laing Date: Thu, 3 Sep 2015 01:52:31 +0000 (+1200) Subject: net/ipv6: Correct PIM6 mrt_lock handling X-Git-Tag: v4.3-rc1~28^2~49 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25b4a44c19c83d98e8c0807a7ede07c1f28eab8b;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git 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 Acked-by: Cong Wang Signed-off-by: David S. Miller --- diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 74ceb73..5f36266 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); }