Received: by 2002:ac0:e34a:0:0:0:0:0 with SMTP id g10csp484750imn; Wed, 27 Jul 2022 11:30:13 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vuJg7KqanpKgWqRwLFQkqZTX5y4f4KJg/VCwpDnduNXX5JD3yPSpkrLdQkA4PFBTNqlEsg X-Received: by 2002:a17:907:d88:b0:72b:1127:33f5 with SMTP id go8-20020a1709070d8800b0072b112733f5mr18842401ejc.725.1658946613090; Wed, 27 Jul 2022 11:30:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658946613; cv=none; d=google.com; s=arc-20160816; b=NyAk9lCvbANjaxu0yD72UaFmjy3OsC9r2SqyXEXXtkkUj1BnZ8dE82k+77Z4VmaJyY 4/ZmT6X1t5XEhNZjwRcPwkj5G8mK9iK/B4OZdOEffyKTsDEwSxaaGgZGiMiEPoqxfiqB mHUUPqYSvQaLqZKcs96u7YKNAtaL/KjpchBE5brB3gNbYrRNaL9C1xlM/kFj2U5qzsDJ bVMYUA2o1Q8kju1nkH1/58di71xv7N8538U3HyxHiK6uSILaxqP+F/MGHA1FZvetxh8O iNkCKaZ38ChwI+8wepv6gLqPll/aqRXiNvj0T55uULTn1Gk35yrn98Yk4p4VjTCl6biv qKgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UNa+kEWjOh+u8CQkt4RLahRqsJdJsluYMJAmb7nhks8=; b=GsFzhJDawCFUigGGGAdno+evwjPPNrIWmjygpUMgk6ZcvcArdn3kqM/fKCNc8FbqL1 IlK/aiH9LHkEAGgNE6VyEuNRMfMwuLosmKXgVCMrdULAw+xvl62jbRdiWVT9W/Nddn6m iN6fkByMQsK2yIv19SlO0kCKPJ0vzNxDKPDKYhKPCWy2Szn/jDXdY04hwhCZk5n0LqDu rO5nHEpvzNebtyD9KBSzlBbOjraz9GEXdHx6Tb4Xh2ajtXabh01qwIHf5LozHd31GK4E HhngfC9CWVsuFV9YHWboOJqNPQM+oVY31XW7LPGl1Itw0DisfKSOVO0tNjiPdF1jFuCY Bi3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="D1/NTL4U"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ka13-20020a170907990d00b00722d5b8794dsi15769449ejc.308.2022.07.27.11.29.48; Wed, 27 Jul 2022 11:30:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="D1/NTL4U"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237983AbiG0QfJ (ORCPT + 99 others); Wed, 27 Jul 2022 12:35:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237868AbiG0Qdp (ORCPT ); Wed, 27 Jul 2022 12:33:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE66A474CB; Wed, 27 Jul 2022 09:26:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 92537619F4; Wed, 27 Jul 2022 16:26:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C047C433D6; Wed, 27 Jul 2022 16:26:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658939204; bh=W0q27RSXpDQKArdu1Qarm0cHko2rXjDyC3znbuUCfFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D1/NTL4UUMpSqRBwB6b6Pc2GU/jL9jxLcEQp74oQCU16+wCRTt5V3qxqFicxvCDIj yEAkFlo1ukjIgNVhNjDYTnZAVAEhQ8NXpZO0nB6BbWe8PH3AWtxw7xqio//hf0yVA4 CCpu7MjshLMfgoVVVWM3/KZDpvCGw4p3o2PMstM8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kuniyuki Iwashima , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 18/62] igmp: Fix a data-race around sysctl_igmp_max_memberships. Date: Wed, 27 Jul 2022 18:10:27 +0200 Message-Id: <20220727161004.910586609@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220727161004.175638564@linuxfoundation.org> References: <20220727161004.175638564@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kuniyuki Iwashima [ Upstream commit 6305d821e3b9b5379d348528e5b5faf316383bc2 ] While reading sysctl_igmp_max_memberships, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Kuniyuki Iwashima Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv4/igmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 957e1170a8a3..b831825f234f 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -2212,7 +2212,7 @@ static int __ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr, count++; } err = -ENOBUFS; - if (count >= net->ipv4.sysctl_igmp_max_memberships) + if (count >= READ_ONCE(net->ipv4.sysctl_igmp_max_memberships)) goto done; iml = sock_kmalloc(sk, sizeof(*iml), GFP_KERNEL); if (!iml) -- 2.35.1