Received: by 2002:ac0:e34a:0:0:0:0:0 with SMTP id g10csp485334imn; Wed, 27 Jul 2022 11:31:05 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ulQ7/EcyW86+rUONHF4s/KJUGMmreYHxCZe/Rvn6BEkj1C2Gw0z9J+lM6D4zDjh5bpKOXv X-Received: by 2002:a17:906:9b86:b0:6fe:d37f:b29d with SMTP id dd6-20020a1709069b8600b006fed37fb29dmr18559896ejc.327.1658946665403; Wed, 27 Jul 2022 11:31:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658946665; cv=none; d=google.com; s=arc-20160816; b=gHP7gfWzVH/FjPgAt1wud2EnRkuZEFSc0rJxgNXnzgA/chOhTeMZWnoxP8iUYjhmaq CnK+C+0H1Gs9BHDbprc4Gvhmp5f+3Vmfu6dqJrchJExo4i/i2c4kYo+WcKKFXSUJ+DE2 NaAJe/iX3D80VXMs9duyu+ZQQJLC66Q2u1oVMBtQAFtPBNKtvtzC5lwyuGD4vp4m8jCL yj7PQYcB1uNdiCZhNrZK4RWKgmUS5TAdnkaDTSUddKqJ5qRN5yKMA4jL6iBkmimgsvjf D0haiF8vtCCUj4GGwi0/bJ1ZKlqj2xeyYeoQ9xVLB4b0C963G1klQocvoyln8ElI2jC+ s1AA== 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=i4XuYs9YTsGoG0hGblysH0KyRaDVH1ZjQrlJ7uApxIc=; b=wvpWfwYkCUecnNG+fqu7AhQr8fgxPXpHuVfkVxjrPQ13CeUIgR9iwFVsQRdZHxA1zB U3wAlrCYphsOQeFcSw95kA7GP7RUjZ6wcOGXvT/SAcg9CvEP0fLx4KosfbTR7Urpim9M q6ww1BjynX11jH5Sui3tpLWfVBSJ2Ls5J32AfYPyAquKjSa1s3GhB3qnOu1fY9y4Kb5W e+AzU2JZ+lGEqmVIZQcmKS1CjnPbLNV+JBVcUJwVkssKMdyQngBWXRcXNHC0leRbclXI dPkKir+tHlL/BQ4zhmIEklqlIF0t8mKqDanMvt3uP128pl5QmXYFK8+l/YKY/KuxuSxL XU1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WnLFJbvY; 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 cf20-20020a170906b2d400b0072f1d8e7300si8872736ejb.430.2022.07.27.11.30.39; Wed, 27 Jul 2022 11:31:05 -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=WnLFJbvY; 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 S235498AbiG0QWw (ORCPT + 99 others); Wed, 27 Jul 2022 12:22:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234732AbiG0QWC (ORCPT ); Wed, 27 Jul 2022 12:22:02 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBAD231238; Wed, 27 Jul 2022 09:22:01 -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 sin.source.kernel.org (Postfix) with ESMTPS id A38FDCE2304; Wed, 27 Jul 2022 16:21:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F1D9C433C1; Wed, 27 Jul 2022 16:21:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658938918; bh=baCgCy56YObxzhgX2L4La7FM8mD+ITUsB5YBk92O+E4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WnLFJbvYmfmgTmfHCuULrJWxPzfXM1FfxM7ysPyd00NLDPUF00rdo5ejKI9v+cHnh Hg6l9kXFhFCBIfYPaF/TWE8TtFikERqVponiOvopIPzE+2RYRXEb4YgHVL8z2fHR/Q MSJ5Q0TlsFwE9WfymxrOjWIJG15L3VrDdc2SdZgs= 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.9 14/26] igmp: Fix a data-race around sysctl_igmp_max_memberships. Date: Wed, 27 Jul 2022 18:10:43 +0200 Message-Id: <20220727160959.689789254@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220727160959.122591422@linuxfoundation.org> References: <20220727160959.122591422@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 6e217424e0ff..3c09bee931b7 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -2171,7 +2171,7 @@ 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