From nobody Mon Feb 9 12:01:48 2026 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 13C02633EF; Wed, 13 Mar 2024 16:33:33 +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=1710347613; cv=none; b=XcZH3AcntBCnbqLXcYhxDwDRwgRPb+Hx9XtXwAnBUexEH/S7N+FG/nncCEW7KaQZW4O16j21Zs2ibubeESbAGYJuo28O1rRzhBGBVQq2RlJWhmm6iByrIMyF3QBgLM/ej60MdZqIJ9B8ngOSqvST8lEbCqSCydS3Ha7XW+pAdcU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710347613; c=relaxed/simple; bh=sMKE9+q0Dh0q2fgAnNSJaMiGGhkv/VNO3lY3K/oikNk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FmdKjZWDZOLcphHVJ8fgpDra0f7RwqTvGX56ZsEkXtNjDFpUnG+m8rVCX7lXtLAv/TSwWjgRaljcqvsKV7UtXycE9QQ+R/t2DMGxh8IhKWSfmLYfuagFu8eNRyknFP4UuS2yrBK4YwXeWHbzPcEwCw+kmFboCwH4ZmVlSenTBrY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mf7Ha07Z; 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="mf7Ha07Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39F4FC433F1; Wed, 13 Mar 2024 16:33:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710347613; bh=sMKE9+q0Dh0q2fgAnNSJaMiGGhkv/VNO3lY3K/oikNk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mf7Ha07ZDQiepiTA6A3HhACGX1CuF6vw6YADJ078+v9JVoH9bukKdaXLCmZWof1zh dfYCnN9uIMJGbEzELIpGo22MFCJZeBt7nLrudGGOxMEQTMr/W1ThU5055/GHzplBxA kJI5yozhNIDWtB2Uc7Q2BAUkj1l/vrVqK2HgWMzGZ9jB/MGl+In1FVOxSJRi8rFZa2 O3xd9HGgTku0BN9drilz091GSZjoNFc5Fl7DSh8AL9U5tueUYxIRBy3sF5G1r8T77s qxxHt0mQbV+e7rUDZDsLH02qZPhsMgGnocHYaKfANkka5cn38K+rW7DusSX/SGZddD Wn/hi5/MyLaqQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jason Xing , Paolo Abeni , Sasha Levin Subject: [PATCH 6.7 45/61] netrom: Fix data-races around sysctl_netrom_network_ttl_initialiser Date: Wed, 13 Mar 2024 12:32:20 -0400 Message-ID: <20240313163236.613880-46-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313163236.613880-1-sashal@kernel.org> References: <20240313163236.613880-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.7.10-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-6.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 6.7.10-rc1 X-KernelTest-Deadline: 2024-03-15T16:32+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jason Xing [ Upstream commit 119cae5ea3f9e35cdada8e572cc067f072fa825a ] We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/netrom/nr_dev.c | 2 +- net/netrom/nr_out.c | 2 +- net/netrom/nr_subr.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index 3aaac4a22b387..2c34389c3ce6f 100644 --- a/net/netrom/nr_dev.c +++ b/net/netrom/nr_dev.c @@ -81,7 +81,7 @@ static int nr_header(struct sk_buff *skb, struct net_devi= ce *dev, buff[6] |=3D AX25_SSSID_SPARE; buff +=3D AX25_ADDR_LEN; =20 - *buff++ =3D sysctl_netrom_network_ttl_initialiser; + *buff++ =3D READ_ONCE(sysctl_netrom_network_ttl_initialiser); =20 *buff++ =3D NR_PROTO_IP; *buff++ =3D NR_PROTO_IP; diff --git a/net/netrom/nr_out.c b/net/netrom/nr_out.c index 44929657f5b71..5e531394a724b 100644 --- a/net/netrom/nr_out.c +++ b/net/netrom/nr_out.c @@ -204,7 +204,7 @@ void nr_transmit_buffer(struct sock *sk, struct sk_buff= *skb) dptr[6] |=3D AX25_SSSID_SPARE; dptr +=3D AX25_ADDR_LEN; =20 - *dptr++ =3D sysctl_netrom_network_ttl_initialiser; + *dptr++ =3D READ_ONCE(sysctl_netrom_network_ttl_initialiser); =20 if (!nr_route_frame(skb, NULL)) { kfree_skb(skb); diff --git a/net/netrom/nr_subr.c b/net/netrom/nr_subr.c index e2d2af924cff4..c3bbd5880850b 100644 --- a/net/netrom/nr_subr.c +++ b/net/netrom/nr_subr.c @@ -182,7 +182,8 @@ void nr_write_internal(struct sock *sk, int frametype) *dptr++ =3D nr->my_id; *dptr++ =3D frametype; *dptr++ =3D nr->window; - if (nr->bpqext) *dptr++ =3D sysctl_netrom_network_ttl_initialiser; + if (nr->bpqext) + *dptr++ =3D READ_ONCE(sysctl_netrom_network_ttl_initialiser); break; =20 case NR_DISCREQ: @@ -236,7 +237,7 @@ void __nr_transmit_reply(struct sk_buff *skb, int mine,= unsigned char cmdflags) dptr[6] |=3D AX25_SSSID_SPARE; dptr +=3D AX25_ADDR_LEN; =20 - *dptr++ =3D sysctl_netrom_network_ttl_initialiser; + *dptr++ =3D READ_ONCE(sysctl_netrom_network_ttl_initialiser); =20 if (mine) { *dptr++ =3D 0; --=20 2.43.0