Skip to content

Commit 4c0d7cd

Browse files
author
Al Viro
committed
make sure that __dentry_kill() always invalidates d_seq, unhashed or not
RCU pathwalk relies upon the assumption that anything that changes ->d_inode of a dentry will invalidate its ->d_seq. That's almost true - the one exception is that the final dput() of already unhashed dentry does *not* touch ->d_seq at all. Unhashing does, though, so for anything we'd found by RCU dcache lookup we are fine. Unfortunately, we can *start* with an unhashed dentry or jump into it. We could try and be careful in the (few) places where that could happen. Or we could just make the final dput() invalidate the damn thing, unhashed or not. The latter is much simpler and easier to backport, so let's do it that way. Reported-by: "Dae R. Jeong" <threeearcat@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 119e1ef commit 4c0d7cd

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

fs/dcache.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -358,14 +358,11 @@ static void dentry_unlink_inode(struct dentry * dentry)
358358
__releases(dentry->d_inode->i_lock)
359359
{
360360
struct inode *inode = dentry->d_inode;
361-
bool hashed = !d_unhashed(dentry);
362361

363-
if (hashed)
364-
raw_write_seqcount_begin(&dentry->d_seq);
362+
raw_write_seqcount_begin(&dentry->d_seq);
365363
__d_clear_type_and_inode(dentry);
366364
hlist_del_init(&dentry->d_u.d_alias);
367-
if (hashed)
368-
raw_write_seqcount_end(&dentry->d_seq);
365+
raw_write_seqcount_end(&dentry->d_seq);
369366
spin_unlock(&dentry->d_lock);
370367
spin_unlock(&inode->i_lock);
371368
if (!inode->i_nlink)

0 commit comments

Comments
 (0)