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 BD79D18CC1D; Sun, 24 Nov 2024 12:39:24 +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=1732451964; cv=none; b=JwGisczMQUjPuSz5BcmWRXOGHSK/bL/2GesTALwJrBu1VNAtxIzhTB+S+CzuX6ZxGSVLaXiwVV07lKMuwyoP6eydXLMo4X+utBtXsS6yvXXWQOLffSZCCvlFW78ahbqZu3Miw22XQNNCgiqRSqTk082NwhCO8IrmyQLXmT75Hko= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732451964; c=relaxed/simple; bh=jV/5LNaLF4eAPurF6y68h+NYMZkqHY2C9HRdCzqFzdo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fYhml3cs6Zivy5GnO37PiYip0WEEg2K3eZNI5588zWptNN4qg9watCLcUEKXPE7jL/ShDCtkK9j8UcXmt5lApTQIvU/1f7ajSEnBcxcbe2cKxjRTUnTluysQzT/tFYjv0AGCf0wp/FGgAOVPiB5Woya3hMHkIE8zjsmfl20Xtm4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S5uvAF0q; 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="S5uvAF0q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73352C4CED1; Sun, 24 Nov 2024 12:39:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732451964; bh=jV/5LNaLF4eAPurF6y68h+NYMZkqHY2C9HRdCzqFzdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S5uvAF0qXHbqOj0Ezg61oGbjpRpk0nFRfYUrJumwOzpttplTXs8TK/bpk7xpPzaz3 n7CPGlbMer3H+7rfm/66921oewInvNwJhQhzVBZQT/tbjS7Ov5CWOf14Q0trGcTMlk MV5npwFXGIaoMhIgaIb8K/YnDcB01vIPm296xOuqZEHcJCLkn4BonQAQLwrk3Y3XY5 kIgYC4Bjdizf/fK2rQnUUS+4gsKnO26j99DzNI/oxhR3PJRAO3YLGic8iqJ6IK2hGa zHJITmgUbPe/EdB/AKSvQ4rCfFo5ek40Irm7odjrhUjA/8BHl8kaKd8DcVfXN2LFv8 w48QZ6J6XBcpA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christian Brauner , Jan Kara , syzbot+3b6b32dc50537a49bb4a@syzkaller.appspotmail.com, Sasha Levin , viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 04/19] epoll: annotate racy check Date: Sun, 24 Nov 2024 07:38:39 -0500 Message-ID: <20241124123912.3335344-4-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241124123912.3335344-1-sashal@kernel.org> References: <20241124123912.3335344-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.1 Content-Transfer-Encoding: 8bit From: Christian Brauner [ Upstream commit 6474353a5e3d0b2cf610153cea0c61f576a36d0a ] Epoll relies on a racy fastpath check during __fput() in eventpoll_release() to avoid the hit of pointlessly acquiring a semaphore. Annotate that race by using WRITE_ONCE() and READ_ONCE(). Link: https://lore.kernel.org/r/66edfb3c.050a0220.3195df.001a.GAE@google.com Link: https://lore.kernel.org/r/20240925-fungieren-anbauen-79b334b00542@brauner Reviewed-by: Jan Kara Reported-by: syzbot+3b6b32dc50537a49bb4a@syzkaller.appspotmail.com Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/eventpoll.c | 6 ++++-- include/linux/eventpoll.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 1ae4542f0bd88..90fbab6b6f036 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -823,7 +823,8 @@ static bool __ep_remove(struct eventpoll *ep, struct epitem *epi, bool force) to_free = NULL; head = file->f_ep; if (head->first == &epi->fllink && !epi->fllink.next) { - file->f_ep = NULL; + /* See eventpoll_release() for details. */ + WRITE_ONCE(file->f_ep, NULL); if (!is_file_epoll(file)) { struct epitems_head *v; v = container_of(head, struct epitems_head, epitems); @@ -1603,7 +1604,8 @@ static int attach_epitem(struct file *file, struct epitem *epi) spin_unlock(&file->f_lock); goto allocate; } - file->f_ep = head; + /* See eventpoll_release() for details. */ + WRITE_ONCE(file->f_ep, head); to_free = NULL; } hlist_add_head_rcu(&epi->fllink, file->f_ep); diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h index 3337745d81bd6..0c0d00fcd131f 100644 --- a/include/linux/eventpoll.h +++ b/include/linux/eventpoll.h @@ -42,7 +42,7 @@ static inline void eventpoll_release(struct file *file) * because the file in on the way to be removed and nobody ( but * eventpoll ) has still a reference to this file. */ - if (likely(!file->f_ep)) + if (likely(!READ_ONCE(file->f_ep))) return; /* -- 2.43.0