Received: by 2002:ac0:e34a:0:0:0:0:0 with SMTP id g10csp482142imn; Wed, 27 Jul 2022 11:25:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sD4/U6f5/MIJMV/ZRMaX3PayDfHaOy/Rsg4R8HHeslo9BR8mZUG67mbxhS+yaSL1gM77XL X-Received: by 2002:aa7:c843:0:b0:43c:d6f0:7d6e with SMTP id g3-20020aa7c843000000b0043cd6f07d6emr833133edt.337.1658946353648; Wed, 27 Jul 2022 11:25:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658946353; cv=none; d=google.com; s=arc-20160816; b=jbTaEs4480ufEWMuFitf+WqJA9R8cZ80dLd8X0VA/7wvu+C+1kXhXbSDSCom+qd8N1 njqfdNqcQ6bvZkiFsgVr9GV50eOhP1PEonL0meILGtjD1XwlgK/lpWBo1Zy/rdpe1+oL B1zIRmlKRSRrEyt19yafSpf6IzrBIcSj/AXKNw3TmUZyP3mUsMAdMTe6P+cu88IglJyw KJpX0CncBuGnJV0+sOFRzcrj72eDcjtzFg4E41ANrxBYXftEr/fZ2QBOreVG4Rk7xw2L Iaa2WHMerHgZMhuLh5GawMZRveQfsVgDeQncdWSFzkEK9I9BVvoOIC2+xu98XFTo2sJQ KCAQ== 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=V6R9Gb2asp6/MOQnr4yWlgmVWMCJN+0IVXGX4+p2dNQ=; b=S5yQbpz3YlJDEwRQU/dmE1IbPAVPWNS6plP6+qEenN7zoKRaZRvj4cpP0fgXjkjzBp oXm3RFGvgOi2IomfD7M8llSdsSFirlZW9hJvOCvZRSdC3BGvWQHKtCnuNdhNo7X2hbn2 VvV6QHfumf9i/G5pBkrtaGfAjHCgTCJh/b0FmwbXrB4FI0DtbBDp/c3oXs/6TZDfshnP pLgwhtgNkyHhBL8iysv4lCqzDBcYtko9r+RJfc7TGHowjM1n6rSELAQ0DglUXP6Ydgfa JSTOG1aPs79xTJOAEth3k/c0QkhMqIDHe3FkcwzU07SsCYIDXNwuM1PjaV/9cHTjXgon 1E+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EoVvVUY4; 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 hb33-20020a170907162100b0072b4a6fd638si21596757ejc.543.2022.07.27.11.25.28; Wed, 27 Jul 2022 11:25:53 -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=EoVvVUY4; 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 S240918AbiG0QxW (ORCPT + 99 others); Wed, 27 Jul 2022 12:53:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240740AbiG0Qv5 (ORCPT ); Wed, 27 Jul 2022 12:51:57 -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 CF2EE54ACD; Wed, 27 Jul 2022 09:33:44 -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 6C1F161A73; Wed, 27 Jul 2022 16:33:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 781A6C433D7; Wed, 27 Jul 2022 16:33:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658939623; bh=pTuT1y7MIMwQAMLnXc6jbCjzwuspIUSwjD8D+5/Dmh4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EoVvVUY4iE8Wa5Z98Ga54a44mDqHt4PqmsC3bV6hhsAuvBMx6PIPsSKMC7+HvckQ5 IvvD0DNmFiEwNi/5/NSihY05pI+gXZY8QrvLjJVt+77KQrnvKWNzcHXbx79WXmqDTX zxGllLnTj67hqDkNCbmZjNH00p+MNMIAhi0mVvqc= 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 5.10 046/105] igmp: Fix a data-race around sysctl_igmp_max_memberships. Date: Wed, 27 Jul 2022 18:10:32 +0200 Message-Id: <20220727161013.928573493@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220727161012.056867467@linuxfoundation.org> References: <20220727161012.056867467@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 fd9306950a26..1a70664dcb1a 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -2197,7 +2197,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