Skip to content

Commit a69da89

Browse files
braunergregkh
authored andcommitted
libfs: massage path_from_stashed() to allow custom stashing behavior
[ Upstream commit bda3f16 ] * Add a callback to struct stashed_operations so it's possible to implement custom behavior for pidfs and allow for it to return errors. * Teach stashed_dentry_get() to handle error pointers. Link: https://lore.kernel.org/20250618-work-pidfs-persistent-v2-2-98f3456fd552@kernel.org Reviewed-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com> Signed-off-by: Christian Brauner <brauner@kernel.org> Stable-dep-of: 0b2d71a ("pidfs: Fix memory leak in pidfd_info()") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent f24ea09 commit a69da89

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

fs/internal.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,15 @@ struct mnt_idmap *alloc_mnt_idmap(struct user_namespace *mnt_userns);
322322
struct mnt_idmap *mnt_idmap_get(struct mnt_idmap *idmap);
323323
void mnt_idmap_put(struct mnt_idmap *idmap);
324324
struct stashed_operations {
325+
struct dentry *(*stash_dentry)(struct dentry **stashed,
326+
struct dentry *dentry);
325327
void (*put_data)(void *data);
326328
int (*init_inode)(struct inode *inode, void *data);
327329
};
328330
int path_from_stashed(struct dentry **stashed, struct vfsmount *mnt, void *data,
329331
struct path *path);
330332
void stashed_dentry_prune(struct dentry *dentry);
333+
struct dentry *stash_dentry(struct dentry **stashed, struct dentry *dentry);
331334
struct dentry *stashed_dentry_get(struct dentry **stashed);
332335
/**
333336
* path_mounted - check whether path is mounted

fs/libfs.c

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2126,6 +2126,8 @@ struct dentry *stashed_dentry_get(struct dentry **stashed)
21262126
dentry = rcu_dereference(*stashed);
21272127
if (!dentry)
21282128
return NULL;
2129+
if (IS_ERR(dentry))
2130+
return dentry;
21292131
if (!lockref_get_not_dead(&dentry->d_lockref))
21302132
return NULL;
21312133
return dentry;
@@ -2174,8 +2176,7 @@ static struct dentry *prepare_anon_dentry(struct dentry **stashed,
21742176
return dentry;
21752177
}
21762178

2177-
static struct dentry *stash_dentry(struct dentry **stashed,
2178-
struct dentry *dentry)
2179+
struct dentry *stash_dentry(struct dentry **stashed, struct dentry *dentry)
21792180
{
21802181
guard(rcu)();
21812182
for (;;) {
@@ -2216,12 +2217,15 @@ static struct dentry *stash_dentry(struct dentry **stashed,
22162217
int path_from_stashed(struct dentry **stashed, struct vfsmount *mnt, void *data,
22172218
struct path *path)
22182219
{
2219-
struct dentry *dentry;
2220+
struct dentry *dentry, *res;
22202221
const struct stashed_operations *sops = mnt->mnt_sb->s_fs_info;
22212222

22222223
/* See if dentry can be reused. */
2223-
path->dentry = stashed_dentry_get(stashed);
2224-
if (path->dentry) {
2224+
res = stashed_dentry_get(stashed);
2225+
if (IS_ERR(res))
2226+
return PTR_ERR(res);
2227+
if (res) {
2228+
path->dentry = res;
22252229
sops->put_data(data);
22262230
goto out_path;
22272231
}
@@ -2232,8 +2236,17 @@ int path_from_stashed(struct dentry **stashed, struct vfsmount *mnt, void *data,
22322236
return PTR_ERR(dentry);
22332237

22342238
/* Added a new dentry. @data is now owned by the filesystem. */
2235-
path->dentry = stash_dentry(stashed, dentry);
2236-
if (path->dentry != dentry)
2239+
if (sops->stash_dentry)
2240+
res = sops->stash_dentry(stashed, dentry);
2241+
else
2242+
res = stash_dentry(stashed, dentry);
2243+
if (IS_ERR(res)) {
2244+
dput(dentry);
2245+
return PTR_ERR(res);
2246+
}
2247+
path->dentry = res;
2248+
/* A dentry was reused. */
2249+
if (res != dentry)
22372250
dput(dentry);
22382251

22392252
out_path:

0 commit comments

Comments
 (0)