From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 376F2C282CE for ; Wed, 24 Apr 2019 17:57:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0011B20685 for ; Wed, 24 Apr 2019 17:57:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556128674; bh=VCms38YnSlFIKKg/Ojzn/6FaP4iq62KUJ/vdyzSdA+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JnP24p+EVDz4Hjc19wsQAAGiDudbEMMOqqZaica1EV4bN7zM/2f623MVf2Ne07U79 fv4u2P+3Adnp7aI9Bz31BbSFIZyGkewZkfNGVXM6qQ6xtlBBA53x0/8C4iEcajb1qu NXUGAk+jUCkbGzyvy6JzWYkbIWmhoYq1ieZN9sqU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390053AbfDXRZc (ORCPT ); Wed, 24 Apr 2019 13:25:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:51490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390049AbfDXRZc (ORCPT ); Wed, 24 Apr 2019 13:25:32 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 39DD820835; Wed, 24 Apr 2019 17:25:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126731; bh=VCms38YnSlFIKKg/Ojzn/6FaP4iq62KUJ/vdyzSdA+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xbHTmx+EaQG/LeoqnA6/iGVEVK9Jpn9/3Bsviv2Skumhuk6ueCm9feNscCJ5UhamS AefigohPmt7isnTlT85qFI3AkCXQvC9HkSLuKMQmVA7fLgWt6P4pWKRp/RdHD47Crf yttWgZqcWeB77RNam/fhOjVe9RtPWffg77AReRlo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikolay Aleksandrov , "David S. Miller" Subject: [PATCH 4.9 04/44] net: bridge: multicast: use rcu to access port list from br_multicast_start_querier Date: Wed, 24 Apr 2019 19:09:42 +0200 Message-Id: <20190424170843.003240447@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170839.924291114@linuxfoundation.org> References: <20190424170839.924291114@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nikolay Aleksandrov [ Upstream commit c5b493ce192bd7a4e7bd073b5685aad121eeef82 ] br_multicast_start_querier() walks over the port list but it can be called from a timer with only multicast_lock held which doesn't protect the port list, so use RCU to walk over it. Fixes: c83b8fab06fc ("bridge: Restart queries when last querier expires") Signed-off-by: Nikolay Aleksandrov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/bridge/br_multicast.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1983,7 +1983,8 @@ static void br_multicast_start_querier(s __br_multicast_open(br, query); - list_for_each_entry(port, &br->port_list, list) { + rcu_read_lock(); + list_for_each_entry_rcu(port, &br->port_list, list) { if (port->state == BR_STATE_DISABLED || port->state == BR_STATE_BLOCKING) continue; @@ -1995,6 +1996,7 @@ static void br_multicast_start_querier(s br_multicast_enable(&port->ip6_own_query); #endif } + rcu_read_unlock(); } int br_multicast_toggle(struct net_bridge *br, unsigned long val)