Skip to content

Commit

Permalink
pstore: inode: Only d_invalidate() is needed
Browse files Browse the repository at this point in the history
[ Upstream commit a43e0fc5e9134a46515de2f2f8d4100b74e50de3 ]

Unloading a modular pstore backend with records in pstorefs would
trigger the dput() double-drop warning:

  WARNING: CPU: 0 PID: 2569 at fs/dcache.c:762 dput.part.0+0x3f3/0x410

Using the combo of d_drop()/dput() (as mentioned in
Documentation/filesystems/vfs.rst) isn't the right approach here, and
leads to the reference counting problem seen above. Use d_invalidate()
and update the code to not bother checking for error codes that can
never happen.

Suggested-by: Alexander Viro <viro@zeniv.linux.org.uk>
Fixes: 609e28b ("pstore: Remove filesystem records when backend is unregistered")
Signed-off-by: Kees Cook <keescook@chromium.org>
  • Loading branch information
kees authored and Sasha Levin committed Mar 26, 2024
1 parent 06460a1 commit 340682e
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions fs/pstore/inode.c
Expand Up @@ -307,7 +307,6 @@ int pstore_put_backend_records(struct pstore_info *psi)
{
struct pstore_private *pos, *tmp;
struct dentry *root;
int rc = 0;

root = psinfo_lock_root();
if (!root)
Expand All @@ -317,19 +316,16 @@ int pstore_put_backend_records(struct pstore_info *psi)
list_for_each_entry_safe(pos, tmp, &records_list, list) {
if (pos->record->psi == psi) {
list_del_init(&pos->list);
rc = simple_unlink(d_inode(root), pos->dentry);
if (WARN_ON(rc))
break;
d_drop(pos->dentry);
dput(pos->dentry);
d_invalidate(pos->dentry);
simple_unlink(d_inode(root), pos->dentry);
pos->dentry = NULL;
}
}
}

inode_unlock(d_inode(root));

return rc;
return 0;
}

/*
Expand Down

0 comments on commit 340682e

Please sign in to comment.