From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:52469 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756370AbbI2Mb3 (ORCPT ); Tue, 29 Sep 2015 08:31:29 -0400 Subject: Patch "net/ipv6: Correct PIM6 mrt_lock handling" has been added to the 3.10-stable tree To: richard.laing@alliedtelesis.co.nz, cwang@twopensource.com, davem@davemloft.net, gregkh@linuxfoundation.org Cc: , From: Date: Tue, 29 Sep 2015 14:23:18 +0200 Message-ID: <144352939828214@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled net/ipv6: Correct PIM6 mrt_lock handling to the 3.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: net-ipv6-correct-pim6-mrt_lock-handling.patch and it can be found in the queue-3.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Tue Sep 29 14:20:47 CEST 2015 From: Richard Laing Date: Thu, 3 Sep 2015 13:52:31 +1200 Subject: net/ipv6: Correct PIM6 mrt_lock handling From: Richard Laing [ Upstream commit 25b4a44c19c83d98e8c0807a7ede07c1f28eab8b ] 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 Signed-off-by: Greg Kroah-Hartman --- net/ipv6/ip6mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -552,7 +552,7 @@ static void ipmr_mfc_seq_stop(struct seq 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); } Patches currently in stable-queue which might be from richard.laing@alliedtelesis.co.nz are queue-3.10/net-ipv6-correct-pim6-mrt_lock-handling.patch