public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Oleg Nesterov <oleg@redhat.com>,
	David Howells <dhowells@redhat.com>,
	Marc Dionne <marc.dionne@auristor.com>,
	linux-afs@lists.infradead.org, Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 6.7 15/19] afs: fix the usage of read_seqbegin_or_lock() in afs_lookup_volume_rcu()
Date: Mon, 15 Jan 2024 19:22:51 -0500	[thread overview]
Message-ID: <20240116002311.214705-15-sashal@kernel.org> (raw)
In-Reply-To: <20240116002311.214705-1-sashal@kernel.org>

From: Oleg Nesterov <oleg@redhat.com>

[ Upstream commit 4121b4337146b64560d1e46ebec77196d9287802 ]

David Howells says:

 (2) afs_lookup_volume_rcu().

     There can be a lot of volumes known by a system.  A thousand would
     require a 10-step walk and this is drivable by remote operation, so I
     think this should probably take a lock on the second pass too.

Make the "seq" counter odd on the 2nd pass, otherwise read_seqbegin_or_lock()
never takes the lock.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Link: https://lore.kernel.org/r/20231130115606.GA21571@redhat.com/
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/afs/callback.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/afs/callback.c b/fs/afs/callback.c
index a484fa642808..90f9b2a46ff4 100644
--- a/fs/afs/callback.c
+++ b/fs/afs/callback.c
@@ -110,13 +110,14 @@ static struct afs_volume *afs_lookup_volume_rcu(struct afs_cell *cell,
 {
 	struct afs_volume *volume = NULL;
 	struct rb_node *p;
-	int seq = 0;
+	int seq = 1;
 
 	do {
 		/* Unfortunately, rbtree walking doesn't give reliable results
 		 * under just the RCU read lock, so we have to check for
 		 * changes.
 		 */
+		seq++; /* 2 on the 1st/lockless path, otherwise odd */
 		read_seqbegin_or_lock(&cell->volume_lock, &seq);
 
 		p = rcu_dereference_raw(cell->volumes.rb_node);
-- 
2.43.0


  parent reply	other threads:[~2024-01-16  0:23 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-16  0:22 [PATCH AUTOSEL 6.7 01/19] FS:JFS:UBSAN:array-index-out-of-bounds in dbAdjTree Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 02/19] UBSAN: array-index-out-of-bounds in dtSplitRoot Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 03/19] jfs: fix slab-out-of-bounds Read in dtSearch Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 04/19] jfs: fix array-index-out-of-bounds in dbAdjTree Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 05/19] jfs: fix uaf in jfs_evict_inode Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 06/19] jfs: fix shift-out-of-bounds in dbJoin Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 07/19] hwrng: starfive - Fix dev_err_probe return error Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 08/19] crypto: p10-aes-gcm - Avoid -Wstringop-overflow warnings Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 09/19] pstore/ram: Fix crash when setting number of cpus to an odd number Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 10/19] erofs: fix up compacted indexes for block size < 4096 Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 11/19] crypto: starfive - Fix dev_err_probe return error Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 12/19] crypto: octeontx2 - Fix cptvf driver cleanup Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 13/19] erofs: fix ztailpacking for subpage compressed blocks Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 14/19] crypto: stm32/crc32 - fix parsing list of devices Sasha Levin
2024-01-16  0:22 ` Sasha Levin [this message]
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 16/19] afs: fix the usage of read_seqbegin_or_lock() in afs_find_server*() Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 17/19] rxrpc_find_service_conn_rcu: fix the usage of read_seqbegin_or_lock() Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 18/19] gfs2: Refcounting fix in gfs2_thaw_super Sasha Levin
2024-01-16  0:22 ` [PATCH AUTOSEL 6.7 19/19] jfs: fix array-index-out-of-bounds in diNewExt Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240116002311.214705-15-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=dhowells@redhat.com \
    --cc=linux-afs@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.dionne@auristor.com \
    --cc=oleg@redhat.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox