bcachefs: unlock parent dir if entry is not found in subvolume deletion
PATCH 1/1 bcachefs: unlock parent dir if entry is not found in subvolume deletion
Parent dir is locked by user_path_locked_at() before validating the required dentry. It should be unlocked if we can not perform the deletion.
This fixes the problem:
$ bcachefs subvolume delete not-exist-entry BCH_IOCTL_SUBVOLUME_DESTROY ioctl error: No such file or directory $ bcachefs subvolume delete not-exist-entry
the second will stuck because the parent dir is locked in the previous deletion.
--- fs/bcachefs/fs-ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/bcachefs/fs-ioctl.c +2 -2
@@ -455,6 +455,7 @@ static long bch2_ioctl_subvolume_destroy(struct bch_fs *c, struct file *filp,if (IS_ERR (victim))return PTR_ERR (victim); + dir =d_inode (path.dentry);if (victim->d_sb->s_fs_info != c) { ret = -EXDEV ; goto err;
@@ -463,14 +464,13 @@ static long bch2_ioctl_subvolume_destroy(struct bch_fs *c, struct file *filp, ret = -ENOENT ; goto err; } - dir =d_inode (path.dentry); ret =__bch2_unlink (dir, victim, true);if (!ret) {fsnotify_rmdir (dir, victim);d_delete (victim); } -inode_unlock (dir); err: +inode_unlock (dir);dput (victim);path_put (&path);return ret;
Signature · 1 line
2.43.0
Quoted 4 lines · Guoyu Ou
Parent dir is locked by
user_path_locked_at()before validating the required dentry. It should be unlocked if we can not perform the deletion.
Quoted 8 lines
This fixes the problem:
$ bcachefs subvolume delete not-exist-entry BCH_IOCTL_SUBVOLUME_DESTROY ioctl error: No such file or directory $ bcachefs subvolume delete not-exist-entrythe second will stuck because the parent dir is locked in the previous deletion.
Your fix works, but having user_path_locked_at() return an object that we have a destructor for but needs extra cleanup is not ideal, and now that I look I'm also wondering why the dput(victim) is necessary when path_put() also does a dput().
How do we feel about the following?
Note that my fix is incomplete (and untested); path needs to be zeroed out everywhere it's constructed.
fs/namei.c +6 -3
@@ -559,6 +559,8 @@ EXPORT_SYMBOL(path_get);*/ void path_put (const struct path *path) { +if (path->locked) +inode_unlock (d_inode (path.dentry));dput (path->dentry);mntput (path->mnt); }
@@ -2578,6 +2580,8 @@ static struct dentry *__kern_path_locked(int dfd, struct filename *name, structstruct qstr last;int type, error; +memset (path,0 ,sizeof (*path)); + error =filename_parentat (dfd, name,0 , path, &last, &type);if (error)return ERR_PTR (error);
@@ -2586,11 +2590,10 @@ static struct dentry *__kern_path_locked(int dfd, struct filename *name, structreturn ERR_PTR (-EINVAL ); }inode_lock_nested (path->dentry->d_inode,I_MUTEX_PARENT ); + path->locked = true; d =lookup_one_qstr_excl (&last, path->dentry,0 ); -if (IS_ERR (d)) { -inode_unlock (path->dentry->d_inode); +if (IS_ERR (d))path_put (path); - }return d; }
include/linux/path.h +1 -0
@@ -8,6 +8,7 @@ struct vfsmount;struct path {struct vfsmount *mnt;struct dentry *dentry; +bool locked; } __randomize_layout;extern void path_get (const struct path *);
Quoted 37 lines
Signed-off-by Guoyu Ou <[email protected]>--- fs/bcachefs/fs-ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/bcachefs/fs-ioctl.c +2
-2@@ -455,6 +455,7 @@ static long bch2_ioctl_subvolume_destroy(struct bch_fs *c, struct file *filp,if (IS_ERR (victim))return PTR_ERR (victim); + dir =d_inode (path.dentry);if (victim->d_sb->s_fs_info != c) { ret = -EXDEV ; goto err;@@ -463,14 +464,13 @@ static long bch2_ioctl_subvolume_destroy(struct bch_fs *c, struct file *filp, ret = -ENOENT ; goto err; } - dir =d_inode (path.dentry); ret =__bch2_unlink (dir, victim, true);if (!ret) {fsnotify_rmdir (dir, victim);d_delete (victim); } -inode_unlock (dir); err: +inode_unlock (dir);dput (victim);path_put (&path);return ret;Signature · 1 line
2.43.0
Al Viro
maintainerQuoted 1 line · Kent Overstreet
How do we feel about the following?
No, with side of Fuck, NO.
Al Viro
maintainerQuoted 4 lines · Kent Overstreet
Your fix works, but having
user_path_locked_at()return an object that we have a destructor for but needs extra cleanup is not ideal, and now that I look I'm also wondering why the dput(victim) is necessary whenpath_put()also does adput().
Because victim is not equal to path.dentry, perhaps?
Al Viro
maintainerQuoted 5 lines · Al Viro
Quoted 1 line · Kent Overstreet
How do we feel about the following?
No, with side of Fuck, NO.
To elaborate a bit: that essentially introduces a new type (mount/dentry pair, possibly locked) *and* converts existing instances of struct path (file->f_path, mount->mnt_mountpoint, etc.) to that. Suddenly we get an extra constraint that needs to be verified - "no long-term struct path instance with ->locked being true". What's more, currently one can do
v = *p; path_get(&v); ... path_put(&v); with eventual path_put(p);
possibly from another thread. Every place like that needs a proof that we can't possibly get there with p->locked being true.
There's a lot of other reasons why that's a really bad idea. Seriously, let's not go there.