From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 166E63A1285; Sat, 28 Feb 2026 17:37:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300261; cv=none; b=nWQTHPxjIHiXf2HWgJthGc+7tqNA7OYY/TWvHJychPCP4bCqHLnuuk51LiTTxUcMSFg+Fl7nE9cu2avbPAEVeKae8Rs09XkqXxPoWOzpOKw48Y0urUSrN2lPYjPtQKtO6nSplMV5XeladQjJX+pPAJTo2wju5+t2Gfmt0fbAbnI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300261; c=relaxed/simple; bh=W15cyp0xaAgC3j6Km803kuRKxO/r6w2fW0XBj3f2/Ds=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VFR4BrcP5WcYt1H+7hFbOmB3PlBQRL8NG8DVB8Sw5z9qJRskcabKQIbjBQ0nHTVAgfkiRFQx75fArTEWgfppQECow0WiPIBeyCANFclNX03VcVeUYnsUwR73VBzVEHElSfuKFhOE5jYFqqBG3Zl80L97RJKemezOgWuZ0DUYPWY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=psVkRRKC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="psVkRRKC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B143C116D0; Sat, 28 Feb 2026 17:37:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300261; bh=W15cyp0xaAgC3j6Km803kuRKxO/r6w2fW0XBj3f2/Ds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=psVkRRKCTJ0OkgZJYmmooUq1qVLdixRe5qBK58GHdiZQrxf0O1OgS7qeZgv/JPTDT sKLCg+Zwb4B4nZhcg8tsaouxc/0y7chQ9hKfIWzV25NnPc5bhJLu8XV3hnvFAbSe1M swUAKmv+xEkUjnVSPLmNdS7JWBS3tAXwwsbcuHBwoXMt5IXI9ZdT9FdcavpujWFBaH ctCXTI3vRAs/Y9KLzz13dCxzejM+lDC65aAOu1ZnNU5xGIGjMOr+GC0O4AawolVsj2 is3qv1fgA5UflaPMkBmd4E3N94HWXgpg9z4CLF66eDOKepZqKJwocmhOqBwbppyABc PKfkMss4AmTZg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Dumazet , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.19 286/844] ipv6: exthdrs: annotate data-race over multiple sysctl Date: Sat, 28 Feb 2026 12:23:19 -0500 Message-ID: <20260228173244.1509663-287-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Eric Dumazet [ Upstream commit 978b67d28358b0b4eacfa94453d1ad4e09b123ad ] Following four sysctls can change under us, add missing READ_ONCE(). - ipv6.sysctl.max_dst_opts_len - ipv6.sysctl.max_dst_opts_cnt - ipv6.sysctl.max_hbh_opts_len - ipv6.sysctl.max_hbh_opts_cnt Signed-off-by: Eric Dumazet Reviewed-by: Simon Horman Link: https://patch.msgid.link/20260115094141.3124990-8-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv6/exthdrs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index a23eb8734e151..54088fa0c09d0 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -314,7 +314,7 @@ static int ipv6_destopt_rcv(struct sk_buff *skb) } extlen = (skb_transport_header(skb)[1] + 1) << 3; - if (extlen > net->ipv6.sysctl.max_dst_opts_len) + if (extlen > READ_ONCE(net->ipv6.sysctl.max_dst_opts_len)) goto fail_and_free; opt->lastopt = opt->dst1 = skb_network_header_len(skb); @@ -322,7 +322,8 @@ static int ipv6_destopt_rcv(struct sk_buff *skb) dstbuf = opt->dst1; #endif - if (ip6_parse_tlv(false, skb, net->ipv6.sysctl.max_dst_opts_cnt)) { + if (ip6_parse_tlv(false, skb, + READ_ONCE(net->ipv6.sysctl.max_dst_opts_cnt))) { skb->transport_header += extlen; opt = IP6CB(skb); #if IS_ENABLED(CONFIG_IPV6_MIP6) @@ -1049,11 +1050,12 @@ int ipv6_parse_hopopts(struct sk_buff *skb) } extlen = (skb_transport_header(skb)[1] + 1) << 3; - if (extlen > net->ipv6.sysctl.max_hbh_opts_len) + if (extlen > READ_ONCE(net->ipv6.sysctl.max_hbh_opts_len)) goto fail_and_free; opt->flags |= IP6SKB_HOPBYHOP; - if (ip6_parse_tlv(true, skb, net->ipv6.sysctl.max_hbh_opts_cnt)) { + if (ip6_parse_tlv(true, skb, + READ_ONCE(net->ipv6.sysctl.max_hbh_opts_cnt))) { skb->transport_header += extlen; opt = IP6CB(skb); opt->nhoff = sizeof(struct ipv6hdr); -- 2.51.0