From patchwork Tue May 17 14:37:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veaceslav Falico X-Patchwork-Id: 791712 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4HEdjEw012748 for ; Tue, 17 May 2011 14:39:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755402Ab1EQOjG (ORCPT ); Tue, 17 May 2011 10:39:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38727 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755267Ab1EQOjB (ORCPT ); Tue, 17 May 2011 10:39:01 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4HEc321031611 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 May 2011 10:38:03 -0400 Received: from darkmag.usersys.redhat.com (dhcp-1-250.brq.redhat.com [10.34.1.250]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p4HEbvYJ020956 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Tue, 17 May 2011 10:37:59 -0400 Date: Tue, 17 May 2011 16:37:56 +0200 From: Veaceslav Falico To: David Stevens Cc: David Miller , jmorris@namei.org, kaber@trash.net, kuznet@ms2.inr.ac.ru, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, mmarek@suse.cz, netdev@vger.kernel.org, pekkas@netcore.fi, yoshfuji@linux-ipv6.org Subject: [PATCH v3 1/1] igmp: call ip_mc_clear_src() only when we have no users of ip_mc_list Message-ID: <20110517143756.GE30366@darkmag.usersys.redhat.com> References: <20110515165945.GA20024@darkmag.usersys.redhat.com> <20110516.140359.111037536766782557.davem@davemloft.net> <20110517133801.GC30366@darkmag.usersys.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110517133801.GC30366@darkmag.usersys.redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 17 May 2011 14:39:47 +0000 (UTC) In igmp_group_dropped() we call ip_mc_clear_src(), which resets the number of source filters per mulitcast. However, igmp_group_dropped() is also called on NETDEV_DOWN, NETDEV_PRE_TYPE_CHANGE and NETDEV_UNREGISTER, which means that the group might get added back on NETDEV_UP, NETDEV_REGISTER and NETDEV_POST_TYPE_CHANGE respectively, leaving us with broken source filters. To fix that, we must clear the source filters only when there are no users in the ip_mc_list, i.e. in ip_mc_dec_group(). Correct version of the patch. Signed-off-by: Veaceslav Falico --- -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 1fd3d9c..142ca0d 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -1169,20 +1169,18 @@ static void igmp_group_dropped(struct ip_mc_list *im) if (!in_dev->dead) { if (IGMP_V1_SEEN(in_dev)) - goto done; + return; if (IGMP_V2_SEEN(in_dev)) { if (reporter) igmp_send_report(in_dev, im, IGMP_HOST_LEAVE_MESSAGE); - goto done; + return; } /* IGMPv3 */ igmpv3_add_delrec(in_dev, im); igmp_ifc_event(in_dev); } -done: #endif - ip_mc_clear_src(im); } static void igmp_group_added(struct ip_mc_list *im) @@ -1319,6 +1317,7 @@ void ip_mc_dec_group(struct in_device *in_dev, __be32 addr) *ip = i->next_rcu; in_dev->mc_count--; igmp_group_dropped(i); + ip_mc_clear_src(i); if (!in_dev->dead) ip_rt_multicast_event(in_dev);