From nobody Fri Dec 19 20:12:19 2025 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 7F4B3183B9B; Sun, 24 Mar 2024 23:50:58 +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=1711324258; cv=none; b=B9/QYHriowAq3GQwoDDnE4CrOxZpixfK9D04PO4oLNSkz5wSFVz0QT0nWrl+Rc0WesDz3VZgGiZ826eEXOnCuFwkp3WTlFxakxjCxe4LLZxNg8TF7REW0Z2Sx22LNB7RJCwE9td/T1V8CpfYe7uEFaMMWdAFQ676Y9Hylm2eFjI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324258; c=relaxed/simple; bh=2mIOyCLUxen6vMiVviNHH630xVdtDk1+xUvLm5fHfaM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l3RMVIIuvCs5Trer/mdSY8fXc+gbHQjLAhnSbnCdET4zX5tzKAixuismkekWmnMIaEmUJh0XX1TIXM8rcUkD5+Y4bKj7PxdNKjDHQGnzx0hA7+/VlLIsqfL10UcaNox8JzDF4i/9qD4g3G/wi6ZjuTslZIrAul0PwnVoweiagWc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Bcx1Wwmh; 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="Bcx1Wwmh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3727CC433C7; Sun, 24 Mar 2024 23:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711324258; bh=2mIOyCLUxen6vMiVviNHH630xVdtDk1+xUvLm5fHfaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bcx1Wwmh4lPpHFGLczO/GjRLzBPFK4NDUUzAGGzs49aSOo1QvXUDb/Qiv7y3kBxi2 +gwBk6rDwNuhGfxts/tTaaH2sGAtjQ3ljE62QH0TwWxkdUwr1w/bMDRgCAwP/GYWlf 0B9nO9XP9/eEZBqo2L0rgeiUvqg1AGEcNDnpTncaKHwv0q/MeIpTuc2TrqJDU3S5Kx LmDe3prTlh2AbVFDT+rGypiolYG9UqSmCYty5/Ql02+Si0jodTwM6oIYydG6coFPAI 0AAI0zpm1W6CqHeiUNlXmfD96axAz1RrxJKAPejX+CnkPKdPYbqYV6OUaHvd+C9Gj4 hmPe94Y9K8f6Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Dumazet , Guillaume Nault , Kuniyuki Iwashima , Willem de Bruijn , Paolo Abeni , Sasha Levin Subject: [PATCH 4.19 038/148] sock_diag: annotate data-races around sock_diag_handlers[family] Date: Sun, 24 Mar 2024 19:48:22 -0400 Message-ID: <20240324235012.1356413-39-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324235012.1356413-1-sashal@kernel.org> References: <20240324235012.1356413-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-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Dumazet [ Upstream commit efd402537673f9951992aea4ef0f5ff51d858f4b ] __sock_diag_cmd() and sock_diag_bind() read sock_diag_handlers[family] without a lock held. Use READ_ONCE()/WRITE_ONCE() annotations to avoid potential issues. Fixes: 8ef874bfc729 ("sock_diag: Move the sock_ code to net/core/") Signed-off-by: Eric Dumazet Reviewed-by: Guillaume Nault Reviewed-by: Kuniyuki Iwashima Reviewed-by: Willem de Bruijn Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/core/sock_diag.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c index 3312a5849a974..980a2d4650628 100644 --- a/net/core/sock_diag.c +++ b/net/core/sock_diag.c @@ -187,7 +187,7 @@ int sock_diag_register(const struct sock_diag_handler *= hndl) if (sock_diag_handlers[hndl->family]) err =3D -EBUSY; else - sock_diag_handlers[hndl->family] =3D hndl; + WRITE_ONCE(sock_diag_handlers[hndl->family], hndl); mutex_unlock(&sock_diag_table_mutex); =20 return err; @@ -203,7 +203,7 @@ void sock_diag_unregister(const struct sock_diag_handle= r *hnld) =20 mutex_lock(&sock_diag_table_mutex); BUG_ON(sock_diag_handlers[family] !=3D hnld); - sock_diag_handlers[family] =3D NULL; + WRITE_ONCE(sock_diag_handlers[family], NULL); mutex_unlock(&sock_diag_table_mutex); } EXPORT_SYMBOL_GPL(sock_diag_unregister); @@ -221,7 +221,7 @@ static int __sock_diag_cmd(struct sk_buff *skb, struct = nlmsghdr *nlh) return -EINVAL; req->sdiag_family =3D array_index_nospec(req->sdiag_family, AF_MAX); =20 - if (sock_diag_handlers[req->sdiag_family] =3D=3D NULL) + if (READ_ONCE(sock_diag_handlers[req->sdiag_family]) =3D=3D NULL) sock_load_diag_module(req->sdiag_family, 0); =20 mutex_lock(&sock_diag_table_mutex); @@ -280,12 +280,12 @@ static int sock_diag_bind(struct net *net, int group) switch (group) { case SKNLGRP_INET_TCP_DESTROY: case SKNLGRP_INET_UDP_DESTROY: - if (!sock_diag_handlers[AF_INET]) + if (!READ_ONCE(sock_diag_handlers[AF_INET])) sock_load_diag_module(AF_INET, 0); break; case SKNLGRP_INET6_TCP_DESTROY: case SKNLGRP_INET6_UDP_DESTROY: - if (!sock_diag_handlers[AF_INET6]) + if (!READ_ONCE(sock_diag_handlers[AF_INET6])) sock_load_diag_module(AF_INET6, 0); break; } --=20 2.43.0