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 3B40A1E7C2E; Wed, 15 Jan 2025 10:46:07 +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=1736937968; cv=none; b=kVKVbOlmjjDimuAliHl1NogmWHUm1UeZqM1Eh8IEwZJ3OzxZvW3Gg2jZJf3MGhrptpNje7DRfLQQ+3Zvnjkgp4uZ3UzxAFOmeH1tBoySpodwuFItbUxiZ/9Sq4P+LgvFArFg+vW0dHmcO7752/fYvORs4f+JvGhKa7huNl/ojDY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736937968; c=relaxed/simple; bh=AZgMKWGIswngV5GclJsAF4SEo1qNfP+TsQ+Z8Lg/aAE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e5thrMcsFFNZJFUdxi+2SesLqnqw5SRaiasM0s6WiBJIlWGtocskhDHvUhiQkG2ck0Sh4L45/cuV4ZcAZ0+i4DxB7pCL/SxPMH4puoxU8JlZUSIvgvljSdoJRPQ6DkOnOv0nCWVS4OsA+KXUEe+Yuas+QG/aWEhtNGULitxK13Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vL/ZDCeW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vL/ZDCeW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41E19C4CEDF; Wed, 15 Jan 2025 10:46:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1736937967; bh=AZgMKWGIswngV5GclJsAF4SEo1qNfP+TsQ+Z8Lg/aAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vL/ZDCeW7K5si3C1/Kv/iIpVQVY9WTOyi3sLb9ud/Ea5TB95u7JkmdQxxNdiBnXOz CTRe5myEKu6IqNPkJsGPFRE6SW8naqJN3JNRUcSAl0s5kOF97bK3lZ+yh+hrL6AJe+ ZHT2bZ2u7Rp4p+AEGWOoIlzrLMRYrLW1sWyzo8eI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daniel Borkmann , Eric Dumazet , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 045/189] tcp: Annotate data-race around sk->sk_mark in tcp_v4_send_reset Date: Wed, 15 Jan 2025 11:35:41 +0100 Message-ID: <20250115103608.157399036@linuxfoundation.org> X-Mailer: git-send-email 2.48.0 In-Reply-To: <20250115103606.357764746@linuxfoundation.org> References: <20250115103606.357764746@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Borkmann [ Upstream commit 80fb40baba19e25a1b6f3ecff6fc5c0171806bde ] This is a follow-up to 3c5b4d69c358 ("net: annotate data-races around sk->sk_mark"). sk->sk_mark can be read and written without holding the socket lock. IPv6 equivalent is already covered with READ_ONCE() annotation in tcp_v6_send_response(). Fixes: 3c5b4d69c358 ("net: annotate data-races around sk->sk_mark") Signed-off-by: Daniel Borkmann Reviewed-by: Eric Dumazet Link: https://patch.msgid.link/f459d1fc44f205e13f6d8bdca2c8bfb9902ffac9.1736244569.git.daniel@iogearbox.net Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv4/tcp_ipv4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index a7cd433a54c9..bcc2f1e090c7 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -896,7 +896,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb, sock_net_set(ctl_sk, net); if (sk) { ctl_sk->sk_mark = (sk->sk_state == TCP_TIME_WAIT) ? - inet_twsk(sk)->tw_mark : sk->sk_mark; + inet_twsk(sk)->tw_mark : READ_ONCE(sk->sk_mark); ctl_sk->sk_priority = (sk->sk_state == TCP_TIME_WAIT) ? inet_twsk(sk)->tw_priority : READ_ONCE(sk->sk_priority); transmit_time = tcp_transmit_time(sk); -- 2.39.5