From: Jan Kara <jack@suse.cz> To: Al Viro <viro@ZenIV.linux.org.uk> Cc: <linux-fsdevel@vger.kernel.org>, Christian Brauner <brauner@kernel.org>, Miklos Szeredi <miklos@szeredi.hu>, "Darrick J. Wong" <djwong@kernel.org>, Ted Tso <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org>, <linux-ext4@vger.kernel.org>, linux-f2fs-devel@lists.sourceforge.net, <linux-xfs@vger.kernel.org>, Jan Kara <jack@suse.cz>, stable@vger.kernel.org Subject: [PATCH 2/6] Revert "udf: Protect rename against modification of moved directory" Date: Thu, 25 May 2023 12:16:08 +0200 [thread overview] Message-ID: <20230525101624.15814-2-jack@suse.cz> (raw) In-Reply-To: <20230525100654.15069-1-jack@suse.cz> This reverts commit f950fd0529130a617b3da526da9fb6a896ce87c2. The locking is going to be provided by vfs_rename() in the following patches. CC: stable@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz> --- fs/udf/namei.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/fs/udf/namei.c b/fs/udf/namei.c index fd20423d3ed2..fd29a66e7241 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c @@ -793,11 +793,6 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir, if (!empty_dir(new_inode)) goto out_oiter; } - /* - * We need to protect against old_inode getting converted from - * ICB to normal directory. - */ - inode_lock_nested(old_inode, I_MUTEX_NONDIR2); retval = udf_fiiter_find_entry(old_inode, &dotdot_name, &diriter); if (retval == -ENOENT) { @@ -806,10 +801,8 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir, old_inode->i_ino); retval = -EFSCORRUPTED; } - if (retval) { - inode_unlock(old_inode); + if (retval) goto out_oiter; - } has_diriter = true; tloc = lelb_to_cpu(diriter.fi.icb.extLocation); if (udf_get_lb_pblock(old_inode->i_sb, &tloc, 0) != @@ -889,7 +882,6 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir, udf_dir_entry_len(&diriter.fi)); udf_fiiter_write_fi(&diriter, NULL); udf_fiiter_release(&diriter); - inode_unlock(old_inode); inode_dec_link_count(old_dir); if (new_inode) @@ -901,10 +893,8 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir, } return 0; out_oiter: - if (has_diriter) { + if (has_diriter) udf_fiiter_release(&diriter); - inode_unlock(old_inode); - } udf_fiiter_release(&oiter); return retval; -- 2.35.3
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: Al Viro <viro@ZenIV.linux.org.uk> Cc: Christian Brauner <brauner@kernel.org>, Ted Tso <tytso@mit.edu>, Miklos Szeredi <miklos@szeredi.hu>, "Darrick J. Wong" <djwong@kernel.org>, Jan Kara <jack@suse.cz>, stable@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>, linux-ext4@vger.kernel.org Subject: [f2fs-dev] [PATCH 2/6] Revert "udf: Protect rename against modification of moved directory" Date: Thu, 25 May 2023 12:16:08 +0200 [thread overview] Message-ID: <20230525101624.15814-2-jack@suse.cz> (raw) In-Reply-To: <20230525100654.15069-1-jack@suse.cz> This reverts commit f950fd0529130a617b3da526da9fb6a896ce87c2. The locking is going to be provided by vfs_rename() in the following patches. CC: stable@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz> --- fs/udf/namei.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/fs/udf/namei.c b/fs/udf/namei.c index fd20423d3ed2..fd29a66e7241 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c @@ -793,11 +793,6 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir, if (!empty_dir(new_inode)) goto out_oiter; } - /* - * We need to protect against old_inode getting converted from - * ICB to normal directory. - */ - inode_lock_nested(old_inode, I_MUTEX_NONDIR2); retval = udf_fiiter_find_entry(old_inode, &dotdot_name, &diriter); if (retval == -ENOENT) { @@ -806,10 +801,8 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir, old_inode->i_ino); retval = -EFSCORRUPTED; } - if (retval) { - inode_unlock(old_inode); + if (retval) goto out_oiter; - } has_diriter = true; tloc = lelb_to_cpu(diriter.fi.icb.extLocation); if (udf_get_lb_pblock(old_inode->i_sb, &tloc, 0) != @@ -889,7 +882,6 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir, udf_dir_entry_len(&diriter.fi)); udf_fiiter_write_fi(&diriter, NULL); udf_fiiter_release(&diriter); - inode_unlock(old_inode); inode_dec_link_count(old_dir); if (new_inode) @@ -901,10 +893,8 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir, } return 0; out_oiter: - if (has_diriter) { + if (has_diriter) udf_fiiter_release(&diriter); - inode_unlock(old_inode); - } udf_fiiter_release(&oiter); return retval; -- 2.35.3 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2023-05-25 10:16 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-05-25 10:16 [PATCH 0/6] fs: Fix directory corruption when moving directories Jan Kara 2023-05-25 10:16 ` [f2fs-dev] " Jan Kara 2023-05-25 10:16 ` [PATCH 1/6] ext4: Remove ext4 locking of moved directory Jan Kara 2023-05-25 10:16 ` [f2fs-dev] " Jan Kara 2023-05-25 10:16 ` Jan Kara [this message] 2023-05-25 10:16 ` [f2fs-dev] [PATCH 2/6] Revert "udf: Protect rename against modification of moved directory" Jan Kara 2023-05-25 10:16 ` [PATCH 3/6] Revert "f2fs: fix potential corruption when moving a directory" Jan Kara 2023-05-25 10:16 ` [f2fs-dev] " Jan Kara 2023-05-25 10:16 ` [PATCH 4/6] fs: Establish locking order for unrelated directories Jan Kara 2023-05-25 10:16 ` [f2fs-dev] " Jan Kara 2023-05-26 9:45 ` Christian Brauner 2023-05-26 9:45 ` [f2fs-dev] " Christian Brauner 2023-05-29 12:41 ` Jan Kara 2023-05-29 12:41 ` [f2fs-dev] " Jan Kara 2023-05-30 12:42 ` Christian Brauner 2023-05-30 12:42 ` [f2fs-dev] " Christian Brauner 2023-05-25 10:16 ` [PATCH 5/6] fs: Lock moved directories Jan Kara 2023-05-25 10:16 ` [f2fs-dev] " Jan Kara 2023-05-25 10:16 ` [PATCH 6/6] fs: Restrict lock_two_nondirectories() to non-directory inodes Jan Kara 2023-05-25 10:16 ` [f2fs-dev] " Jan Kara 2023-05-26 12:13 ` Amir Goldstein 2023-05-26 12:13 ` [f2fs-dev] " Amir Goldstein 2023-05-29 12:42 ` Jan Kara 2023-05-29 12:42 ` [f2fs-dev] " Jan Kara 2023-05-26 15:58 ` [PATCH 0/6] fs: Fix directory corruption when moving directories Christian Brauner 2023-05-26 15:58 ` [f2fs-dev] " Christian Brauner 2023-05-31 14:09 ` Christian Brauner 2023-05-31 14:09 ` Christian Brauner
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=20230525101624.15814-2-jack@suse.cz \ --to=jack@suse.cz \ --cc=brauner@kernel.org \ --cc=djwong@kernel.org \ --cc=jaegeuk@kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ --cc=miklos@szeredi.hu \ --cc=stable@vger.kernel.org \ --cc=tytso@mit.edu \ --cc=viro@ZenIV.linux.org.uk \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.