From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBD96C43331 for ; Mon, 11 Nov 2019 18:48:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4CDD214E0 for ; Mon, 11 Nov 2019 18:48:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498099; bh=bmUt5fzlbHA27VEy5GRmCFjd3Hsjz9seJVCUPTXPoUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aMZkwltm0iGHy015fLmLVtqmfuxgoisqSWq9wKBtM8Vxmika898M/bxv3t4TFJgo9 cLrtFz9gHiW3ezqx1KRlaN2wf97CkaarGXVkD3zUcljcwFMpYiuVuqUmzhn8nviNeW N3c4bpN23N4XWNiJZigDSTKJtL24ZzPw7mUnuQCc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729176AbfKKSsS (ORCPT ); Mon, 11 Nov 2019 13:48:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:41290 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729395AbfKKSsP (ORCPT ); Mon, 11 Nov 2019 13:48:15 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 438FC21655; Mon, 11 Nov 2019 18:48:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498094; bh=bmUt5fzlbHA27VEy5GRmCFjd3Hsjz9seJVCUPTXPoUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ixVS5Joo9FGxB6YjqCUakrVU3q1A9e3T3kO7zl9XrE4hcaqs/kYXHItsJtOLlGwIY 4k8DGJtJkNvX99U9ms+Ljf00ROa8rnEVe//myRMYtFmboUrdRUDACIDTGltFRGTRtO lGVxnSjO/2hFq2aZH0xxH651mKtYZjkga5NOM7z0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , Deepa Dinamani , "David S. Miller" Subject: [PATCH 5.3 020/193] net: prevent load/store tearing on sk->sk_stamp Date: Mon, 11 Nov 2019 19:26:42 +0100 Message-Id: <20191111181501.651927021@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet [ Upstream commit f75359f3ac855940c5718af10ba089b8977bf339 ] Add a couple of READ_ONCE() and WRITE_ONCE() to prevent load-tearing and store-tearing in sock_read_timestamp() and sock_write_timestamp() This might prevent another KCSAN report. Fixes: 3a0ed3e96197 ("sock: Make sock->sk_stamp thread-safe") Signed-off-by: Eric Dumazet Cc: Deepa Dinamani Acked-by: Deepa Dinamani Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- include/net/sock.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2331,7 +2331,7 @@ static inline ktime_t sock_read_timestam return kt; #else - return sk->sk_stamp; + return READ_ONCE(sk->sk_stamp); #endif } @@ -2342,7 +2342,7 @@ static inline void sock_write_timestamp( sk->sk_stamp = kt; write_sequnlock(&sk->sk_stamp_seq); #else - sk->sk_stamp = kt; + WRITE_ONCE(sk->sk_stamp, kt); #endif }