| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220526134119.242182-3-javierm@redhat.com>
Date: Thu, 26 May 2022 15:41:18 +0200
From: Javier Martinez Canillas <javierm@...hat.com>
To: linux-kernel@...r.kernel.org
Cc: Christian Kellner <ckellner@...hat.com>,
Muhammad Usama Anjum <usama.anjum@...labora.com>,
Alexander Larsson <alexl@...hat.com>,
Alberto Ruiz <aruiz@...hat.com>,
Peter Jones <pjones@...hat.com>,
Lennart Poettering <lennart@...ttering.net>,
Colin Walters <walters@...bum.org>,
Chung-Chiang Cheng <cccheng@...ology.com>,
Javier Martinez Canillas <javierm@...hat.com>,
OGAWA Hirofumi <hirofumi@...l.parknet.co.jp>
Subject: [PATCH v3 2/3] fat: add renameat2 RENAME_EXCHANGE flag support
The renameat2 RENAME_EXCHANGE flag allows to atomically exchange two paths
but is currently not supported by the Linux vfat filesystem driver.
Add a vfat_rename_exchange() helper function that implements this support.
The super block lock is acquired during the operation to ensure atomicity,
and in the error path actions made are reversed also with the mutex held.
It makes the operation as transactional as possible, within the limitation
impossed by vfat due not having a journal with logs to replay.
Signed-off-by: Javier Martinez Canillas <javierm@...hat.com>
---
(no changes since v2)
Changes in v2:
- Only update the new_dir inode version and timestamps if != old_dir
(Alex Larsson).
- Add some helper functions to avoid duplicating code (OGAWA Hirofumi).
- Use braces for multi-lines blocks even if are one statement (OGAWA Hirofumi).
- Mention in commit message that the operation is as transactional as possible
but within the vfat limitations of not having a journal (Colin Walters).
fs/fat/namei_vfat.c | 174 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 173 insertions(+), 1 deletion(-)
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index 88ccb2ee3537..97caec8c5207 100644
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -1017,13 +1017,185 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
goto out;
}
+/* Helpers for vfat_rename_exchange() */
+
+static int vfat_get_dotdot_info(struct inode *inode, struct buffer_head **dotdot_bh,
+ struct msdos_dir_entry **dotdot_de)
+{
+ if (!S_ISDIR(inode->i_mode))
+ return 0;
+
+ return fat_get_dotdot_entry(inode, dotdot_bh, dotdot_de);
+}
+
+static void vfat_exchange_dentries(struct inode *old_inode, struct inode *new_inode,
+ loff_t old_i_pos, loff_t new_i_pos)
+{
+ fat_detach(old_inode);
+ fat_detach(new_inode);
+
+ fat_attach(old_inode, new_i_pos);
+ fat_attach(new_inode, old_i_pos);
+}
+
+static int vfat_sync_after_exchange(struct inode *dir, struct inode *inode)
+{
+ int err = 0;
+
+ if (IS_DIRSYNC(dir))
+ err = fat_sync_inode(inode);
+ else
+ mark_inode_dirty(inode);
+
+ return err;
+}
+
+static int vfat_update_dotdot_info(struct buffer_head *dotdot_bh, struct msdos_dir_entry *dotdot_de,
+ struct inode *dir, struct inode *inode)
+{
+ int err = 0;
+
+ fat_set_start(dotdot_de, MSDOS_I(dir)->i_logstart);
+ mark_buffer_dirty_inode(dotdot_bh, inode);
+
+ if (IS_DIRSYNC(dir))
+ err = sync_dirty_buffer(dotdot_bh);
+
+ return err;
+}
+
+static void vfat_update_dir_metadata(struct inode *dir, struct timespec64 *ts)
+{
+ inode_inc_iversion(dir);
+ fat_truncate_time(dir, ts, S_CTIME | S_MTIME);
+
+ if (IS_DIRSYNC(dir))
+ (void)fat_sync_inode(dir);
+ else
+ mark_inode_dirty(dir);
+}
+
+static int vfat_rename_exchange(struct inode *old_dir, struct dentry *old_dentry,
+ struct inode *new_dir, struct dentry *new_dentry)
+{
+ struct buffer_head *old_dotdot_bh = NULL, *new_dotdot_bh = NULL;
+ struct msdos_dir_entry *old_dotdot_de = NULL, *new_dotdot_de = NULL;
+ struct inode *old_inode, *new_inode;
+ struct timespec64 ts = current_time(old_dir);
+ loff_t old_i_pos, new_i_pos;
+ int err, corrupt = 0;
+ struct super_block *sb = old_dir->i_sb;
+
+ old_inode = d_inode(old_dentry);
+ new_inode = d_inode(new_dentry);
+
+ /* Acquire super block lock for the operation to be atomic */
+ mutex_lock(&MSDOS_SB(sb)->s_lock);
+
+ /* if directories are not the same, get ".." info to update */
+ if (old_dir != new_dir) {
+ err = vfat_get_dotdot_info(old_inode, &old_dotdot_bh, &old_dotdot_de);
+ if (err)
+ goto out;
+
+ err = vfat_get_dotdot_info(new_inode, &new_dotdot_bh, &new_dotdot_de);
+ if (err)
+ goto out;
+ }
+
+ old_i_pos = MSDOS_I(old_inode)->i_pos;
+ new_i_pos = MSDOS_I(new_inode)->i_pos;
+
+ /* exchange the two dentries */
+ vfat_exchange_dentries(old_inode, new_inode, old_i_pos, new_i_pos);
+
+ err = vfat_sync_after_exchange(old_dir, new_inode);
+ if (err)
+ goto error_exchange;
+
+ err = vfat_sync_after_exchange(new_dir, old_inode);
+ if (err)
+ goto error_exchange;
+
+ /* update ".." directory entry info */
+ if (old_dotdot_de) {
+ err = vfat_update_dotdot_info(old_dotdot_bh, old_dotdot_de, new_dir, old_inode);
+ if (err)
+ goto error_old_dotdot;
+
+ drop_nlink(old_dir);
+ inc_nlink(new_dir);
+ }
+
+ if (new_dotdot_de) {
+ err = vfat_update_dotdot_info(new_dotdot_bh, new_dotdot_de, old_dir, new_inode);
+ if (err)
+ goto error_new_dotdot;
+
+ drop_nlink(new_dir);
+ inc_nlink(old_dir);
+ }
+
+ /* update inode version and timestamps */
+ inode_inc_iversion(old_inode);
+ inode_inc_iversion(new_inode);
+
+ vfat_update_dir_metadata(old_dir, &ts);
+
+ /* if directories are not the same, update new_dir as well */
+ if (old_dir != new_dir)
+ vfat_update_dir_metadata(new_dir, &ts);
+out:
+ brelse(old_dotdot_bh);
+ brelse(new_dotdot_bh);
+ mutex_unlock(&MSDOS_SB(sb)->s_lock);
+
+ return err;
+
+error_new_dotdot:
+ /* data cluster is shared, serious corruption */
+ corrupt = 1;
+
+ if (new_dotdot_de) {
+ corrupt |= vfat_update_dotdot_info(new_dotdot_bh, new_dotdot_de,
+ new_dir, new_inode);
+ }
+
+error_old_dotdot:
+ /* data cluster is shared, serious corruption */
+ corrupt = 1;
+
+ if (old_dotdot_de) {
+ corrupt |= vfat_update_dotdot_info(old_dotdot_bh, old_dotdot_de,
+ old_dir, old_inode);
+ }
+
+error_exchange:
+ vfat_exchange_dentries(old_inode, new_inode, new_i_pos, old_i_pos);
+
+ if (corrupt) {
+ corrupt |= fat_sync_inode(old_inode);
+ corrupt |= fat_sync_inode(new_inode);
+ }
+
+ if (corrupt < 0) {
+ fat_fs_error(new_dir->i_sb,
+ "%s: Filesystem corrupted (i_pos %lld, %lld)",
+ __func__, old_i_pos, new_i_pos);
+ }
+ goto out;
+}
+
static int vfat_rename2(struct user_namespace *mnt_userns, struct inode *old_dir,
struct dentry *old_dentry, struct inode *new_dir,
struct dentry *new_dentry, unsigned int flags)
{
- if (flags & ~RENAME_NOREPLACE)
+ if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE))
return -EINVAL;
+ if (flags & RENAME_EXCHANGE)
+ return vfat_rename_exchange(old_dir, old_dentry, new_dir, new_dentry);
+
/* VFS already handled RENAME_NOREPLACE, handle it as a normal rename */
return vfat_rename(old_dir, old_dentry, new_dir, new_dentry);
}
--
2.36.1
Powered by blists - more mailing lists