From: cel@kernel.org
To: Hugh Dickens <hughd@google.com>,
Christian Brauner <brauner@kernel.org>,
Al Viro <viro@zeniv.linux.org.uk>
Cc: <linux-fsdevel@vger.kernel.org>, <linux-mm@kvack.org>,
yukuai3@huawei.com, yangerkun@huaweicloud.com,
Chuck Lever <chuck.lever@oracle.com>
Subject: [RFC PATCH v2 2/5] libfs: Check dentry before locking in simple_offset_empty()
Date: Tue, 26 Nov 2024 10:54:41 -0500 [thread overview]
Message-ID: <20241126155444.2556-3-cel@kernel.org> (raw)
In-Reply-To: <20241126155444.2556-1-cel@kernel.org>
From: Chuck Lever <chuck.lever@oracle.com>
Defensive change: Don't try to lock a dentry unless it is positive.
Trying to lock a negative entry will generate a refcount underflow.
The underflow has been seen only while testing.
Fixes: ecba88a3b32d ("libfs: Add simple_offset_empty()")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
fs/libfs.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/fs/libfs.c b/fs/libfs.c
index bf67954b525b..c88ed15437c7 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -347,13 +347,14 @@ int simple_offset_empty(struct dentry *dentry)
index = DIR_OFFSET_MIN;
octx = inode->i_op->get_offset_ctx(inode);
mt_for_each(&octx->mt, child, index, LONG_MAX) {
- spin_lock(&child->d_lock);
if (simple_positive(child)) {
+ spin_lock(&child->d_lock);
+ if (simple_positive(child))
+ ret = 0;
spin_unlock(&child->d_lock);
- ret = 0;
- break;
+ if (!ret)
+ break;
}
- spin_unlock(&child->d_lock);
}
return ret;
--
2.47.0
next prev parent reply other threads:[~2024-11-26 15:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-26 15:54 [RFC PATCH v2 0/5] Improve simple directory offset wrap behavior cel
2024-11-26 15:54 ` [RFC PATCH v2 1/5] libfs: Return ENOSPC when the directory offset range is exhausted cel
2024-11-27 3:11 ` yangerkun
2024-11-26 15:54 ` cel [this message]
2024-11-27 3:09 ` [RFC PATCH v2 2/5] libfs: Check dentry before locking in simple_offset_empty() yangerkun
2024-11-27 14:36 ` Chuck Lever
2024-11-29 8:17 ` yangerkun
2024-11-30 17:03 ` Chuck Lever
2024-11-26 15:54 ` [RFC PATCH v2 3/5] Revert "libfs: fix infinite directory reads for offset dir" cel
2024-11-26 15:54 ` [RFC PATCH v2 4/5] libfs: Refactor end-of-directory detection for simple_offset directories cel
2024-11-26 15:54 ` [RFC PATCH v2 5/5] libfs: Refactor offset_iterate_dir() cel
2024-11-26 16:24 ` [RFC PATCH v2 0/5] Improve simple directory offset wrap behavior Christoph Hellwig
2024-11-26 16:59 ` Chuck Lever III
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=20241126155444.2556-3-cel@kernel.org \
--to=cel@kernel.org \
--cc=brauner@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=hughd@google.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=viro@zeniv.linux.org.uk \
--cc=yangerkun@huaweicloud.com \
--cc=yukuai3@huawei.com \
/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