From patchwork Thu Apr 11 12:08:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1083954 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="bKJMsXIu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44g0DM0hHvz9s4V for ; Thu, 11 Apr 2019 22:08:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726706AbfDKMId (ORCPT ); Thu, 11 Apr 2019 08:08:33 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:32938 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726588AbfDKMId (ORCPT ); Thu, 11 Apr 2019 08:08:33 -0400 Received: by mail-wr1-f66.google.com with SMTP id q1so7061646wrp.0 for ; Thu, 11 Apr 2019 05:08:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cIm1WM2orO7m8M+IcrzbXB+WItZKq8vBKCt7TrMB9d4=; b=bKJMsXIuQpTSfhbFM7mDndOyuZIJT4cD8uu6jZZe8u3W/PSyX6M+nk4ZItYGsKlKgv +menMhmO4x0ap8rTmwKJY0Db1kGx/EeET/UgRRpI/lVHGCL2UpFNKomv9P2+ZXTo3v9E bXS1BorkgN35OOpurIHtheWrsPtFdGSOTha0o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cIm1WM2orO7m8M+IcrzbXB+WItZKq8vBKCt7TrMB9d4=; b=QNkNET9M8HJKPa9A/DIFerPXCrZaDzYlnQE93tJm0nARY40TllSTQYqaHImCuVgilm hV1ah3esYemPzy9n4By5aG8u3xdJqaoSq8bAFyovBuVQWUG44MShFqSzAT5F28r6EMVc bGg+gF/AxR1Kv00aBnnZuEPFWFO7Lhx0OY6dO/PvEmJs0EU7D8HPKp1hmbJtzoEOERES ZSvilt4HUsG5UUf27v4E4HY5wdUas28Px+zf3redAzmtjUSb+lHW7M7Pbje2NHk5wy6M KXQBSLiWEyXc+YD6mE4iOeAbfB7BDD3qlUrxM6sJHDoQussys+1l10xSQ5NqO/efv6NO qmiQ== X-Gm-Message-State: APjAAAU27G+7oXN+DUsuF7IKVAsbaeSmv7ZCWKl7LYH/OcAO54Y0dipm eKfXIHHqaxSHAEWv0GXhz9LI4wNYCJTVdw== X-Google-Smtp-Source: APXvYqwZG0P5Of+1NMdlxi34Qskdg1fVZaTCri+MPZNk8tONqnKCHPhsfQTaQ4UbaRTmRE3dyuPRCA== X-Received: by 2002:a5d:6291:: with SMTP id k17mr32438402wru.223.1554984510909; Thu, 11 Apr 2019 05:08:30 -0700 (PDT) Received: from localhost.localdomain (84-238-136-197.ip.btc-net.bg. [84.238.136.197]) by smtp.gmail.com with ESMTPSA id x5sm29924012wru.12.2019.04.11.05.08.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Apr 2019 05:08:29 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: herbert@gondor.apana.org.au, roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org, Nikolay Aleksandrov Subject: [PATCH net] net: bridge: multicast: use rcu to access port list from br_multicast_start_querier Date: Thu, 11 Apr 2019 15:08:25 +0300 Message-Id: <20190411120825.31221-1-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- net/bridge/br_multicast.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 02da21d771c9..45e7f4173bba 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -2031,7 +2031,8 @@ static void br_multicast_start_querier(struct net_bridge *br, __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; @@ -2043,6 +2044,7 @@ static void br_multicast_start_querier(struct net_bridge *br, br_multicast_enable(&port->ip6_own_query); #endif } + rcu_read_unlock(); } int br_multicast_toggle(struct net_bridge *br, unsigned long val)