From nobody Mon Feb 9 01:44:54 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 71A4D745E5; Wed, 13 Mar 2024 16:38:08 +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=1710347888; cv=none; b=U27iDZn20rnbzBO2tvQEcM7VcEY2G6x7Tqlms6G+7tBHxZZfKnoWJ0AsPRVqtqgL0YNEvKKkdnlmANDj8gOE/W8IOIP4aGoxlL/cTaXbCEeMrSQEkv3XLuYxTMiTz2FwXqMVdMU3cubL7H5wIN6rNmVJ3kv0Dp1TvLTA8Qi6qqU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710347888; c=relaxed/simple; bh=BBbQOkD9HB8cZnLvhAU49b0SIe6uneFg3nFOoqo+pGs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M/QyTNfYcyM+dSSwu9CA9EjZ3SGVjFHoyrJ8yO7beaAyDXxMvm87yM/7ePyTWQ8Pky6wt/ZVsCzAQpyu7oYdV6KLUXFz8bg8TYvbVKKNnCU3xwQ1EwA8ZypU0cC0dfy3WzIveY4QZAnoMXtONRn3CPpS94ja55/3rLWFnQDQOuI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UIZjjFFI; 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="UIZjjFFI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91911C433F1; Wed, 13 Mar 2024 16:38:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710347888; bh=BBbQOkD9HB8cZnLvhAU49b0SIe6uneFg3nFOoqo+pGs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UIZjjFFI11RxwweSNW3B6TdzjNJyhmck6K094tXRsgC6gtjuIqF5MwJkooRBCrmVT JtLmzfl+RBUnlrjB0IopGxWV88jQKp+/cdS3MlgtU4peuM0pgLkWrJZSr5n8ZNxsWl X3FzmhsDzvhs3hGNhsSV3dRsuz4SMIkTQYC6Z4K/YeDJbueP09gDUaqnZmAvF1iepq ogu0CJXU9kqx/ZEW50pYWabxbOsT4Awe7ax2x3yngjC7FWqj0ahEUpxEa09vn5IGQg jN0rxF0Ifx9V6lykXTUSeAwHlTWS3UgrmKNHbnNbFMkN7xI8NPz8wfbOVIX6EKhvIV IlTN7BZVn47Bg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jason Xing , Paolo Abeni , Sasha Levin Subject: [PATCH 6.6 49/60] netrom: Fix data-races around sysctl_net_busy_read Date: Wed, 13 Mar 2024 12:36:56 -0400 Message-ID: <20240313163707.615000-50-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313163707.615000-1-sashal@kernel.org> References: <20240313163707.615000-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.6.22-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-6.6.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 6.6.22-rc1 X-KernelTest-Deadline: 2024-03-15T16:36+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 d380ce70058a4ccddc3e5f5c2063165dc07672c6 ] 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/af_netrom.c | 2 +- net/netrom/nr_in.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 8c69f07651258..f26dee48e03af 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -954,7 +954,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device = *dev) * G8PZT's Xrouter which is sending packets with command type 7 * as an extension of the protocol. */ - if (sysctl_netrom_reset_circuit && + if (READ_ONCE(sysctl_netrom_reset_circuit) && (frametype !=3D NR_RESET || flags !=3D 0)) nr_transmit_reset(skb, 1); =20 diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c index 2f084b6f69d7e..97944db6b5ac6 100644 --- a/net/netrom/nr_in.c +++ b/net/netrom/nr_in.c @@ -97,7 +97,7 @@ static int nr_state1_machine(struct sock *sk, struct sk_b= uff *skb, break; =20 case NR_RESET: - if (sysctl_netrom_reset_circuit) + if (READ_ONCE(sysctl_netrom_reset_circuit)) nr_disconnect(sk, ECONNRESET); break; =20 @@ -128,7 +128,7 @@ static int nr_state2_machine(struct sock *sk, struct sk= _buff *skb, break; =20 case NR_RESET: - if (sysctl_netrom_reset_circuit) + if (READ_ONCE(sysctl_netrom_reset_circuit)) nr_disconnect(sk, ECONNRESET); break; =20 @@ -262,7 +262,7 @@ static int nr_state3_machine(struct sock *sk, struct sk= _buff *skb, int frametype break; =20 case NR_RESET: - if (sysctl_netrom_reset_circuit) + if (READ_ONCE(sysctl_netrom_reset_circuit)) nr_disconnect(sk, ECONNRESET); break; =20 --=20 2.43.0