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
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4f013a0c-9f3f-4a4a-88fa-17460abd702e@paragon-software.com>
Date:   Wed, 6 Dec 2023 18:13:32 +0300
From:   Konstantin Komarovc <almaz.alexandrovich@...agon-software.com>
To:     <ntfs3@...ts.linux.dev>
CC:     <linux-kernel@...r.kernel.org>, <linux-fsdevel@...r.kernel.org>
Subject: [PATCH 12/16] fs/ntfs3: Implement super_operations::shutdown


Signed-off-by: Konstantin Komarov <almaz.alexandrovich@...agon-software.com>
---
  fs/ntfs3/file.c    | 18 ++++++++++++++++++
  fs/ntfs3/frecord.c |  3 +++
  fs/ntfs3/inode.c   | 21 +++++++++++++++++++--
  fs/ntfs3/namei.c   | 12 ++++++++++++
  fs/ntfs3/ntfs_fs.h |  9 ++++++++-
  fs/ntfs3/super.c   | 12 ++++++++++++
  fs/ntfs3/xattr.c   |  3 +++
  7 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index 0ff5d3af2889..07ed3d946e7c 100644
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -260,6 +260,9 @@ static int ntfs_file_mmap(struct file *file, struct 
vm_area_struct *vma)
      bool rw = vma->vm_flags & VM_WRITE;
      int err;

+    if (unlikely(ntfs3_forced_shutdown(inode->i_sb)))
+        return -EIO;
+
      if (is_encrypted(ni)) {
          ntfs_inode_warn(inode, "mmap encrypted not supported");
          return -EOPNOTSUPP;
@@ -677,6 +680,9 @@ int ntfs3_setattr(struct mnt_idmap *idmap, struct 
dentry *dentry,
      umode_t mode = inode->i_mode;
      int err;

+    if (unlikely(ntfs3_forced_shutdown(inode->i_sb)))
+        return -EIO;
+
      err = setattr_prepare(idmap, dentry, attr);
      if (err)
          goto out;
@@ -732,6 +738,9 @@ static ssize_t ntfs_file_read_iter(struct kiocb 
*iocb, struct iov_iter *iter)
      struct inode *inode = file->f_mapping->host;
      struct ntfs_inode *ni = ntfs_i(inode);

+    if (unlikely(ntfs3_forced_shutdown(inode->i_sb)))
+        return -EIO;
+
      if (is_encrypted(ni)) {
          ntfs_inode_warn(inode, "encrypted i/o not supported");
          return -EOPNOTSUPP;
@@ -766,6 +775,9 @@ static ssize_t ntfs_file_splice_read(struct file 
*in, loff_t *ppos,
      struct inode *inode = in->f_mapping->host;
      struct ntfs_inode *ni = ntfs_i(inode);

+    if (unlikely(ntfs3_forced_shutdown(inode->i_sb)))
+        return -EIO;
+
      if (is_encrypted(ni)) {
          ntfs_inode_warn(inode, "encrypted i/o not supported");
          return -EOPNOTSUPP;
@@ -1058,6 +1070,9 @@ static ssize_t ntfs_file_write_iter(struct kiocb 
*iocb, struct iov_iter *from)
      int err;
      struct ntfs_inode *ni = ntfs_i(inode);

+    if (unlikely(ntfs3_forced_shutdown(inode->i_sb)))
+        return -EIO;
+
      if (is_encrypted(ni)) {
          ntfs_inode_warn(inode, "encrypted i/o not supported");
          return -EOPNOTSUPP;
@@ -1118,6 +1133,9 @@ int ntfs_file_open(struct inode *inode, struct 
file *file)
  {
      struct ntfs_inode *ni = ntfs_i(inode);

+    if (unlikely(ntfs3_forced_shutdown(inode->i_sb)))
+        return -EIO;
+
      if (unlikely((is_compressed(ni) || is_encrypted(ni)) &&
               (file->f_flags & O_DIRECT))) {
          return -EOPNOTSUPP;
diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
index 3df2d9e34b91..8744ba36d422 100644
--- a/fs/ntfs3/frecord.c
+++ b/fs/ntfs3/frecord.c
@@ -3259,6 +3259,9 @@ int ni_write_inode(struct inode *inode, int sync, 
const char *hint)
      if (is_bad_inode(inode) || sb_rdonly(sb))
          return 0;

+    if (unlikely(ntfs3_forced_shutdown(sb)))
+        return -EIO;
+
      if (!ni_trylock(ni)) {
          /* 'ni' is under modification, skip for now. */
          mark_inode_dirty_sync(inode);
diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index bba0208c4afd..85452a6b1d40 100644
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -852,9 +852,13 @@ static int ntfs_resident_writepage(struct folio *folio,
                     struct writeback_control *wbc, void *data)
  {
      struct address_space *mapping = data;
-    struct ntfs_inode *ni = ntfs_i(mapping->host);
+    struct inode *inode = mapping->host;
+    struct ntfs_inode *ni = ntfs_i(inode);
      int ret;

+    if (unlikely(ntfs3_forced_shutdown(inode->i_sb)))
+        return -EIO;
+
      ni_lock(ni);
      ret = attr_data_write_resident(ni, &folio->page);
      ni_unlock(ni);
@@ -868,7 +872,12 @@ static int ntfs_resident_writepage(struct folio *folio,
  static int ntfs_writepages(struct address_space *mapping,
                 struct writeback_control *wbc)
  {
-    if (is_resident(ntfs_i(mapping->host)))
+    struct inode *inode = mapping->host;
+
+    if (unlikely(ntfs3_forced_shutdown(inode->i_sb)))
+        return -EIO;
+
+    if (is_resident(ntfs_i(inode)))
          return write_cache_pages(mapping, wbc, ntfs_resident_writepage,
                       mapping);
      return mpage_writepages(mapping, wbc, ntfs_get_block);
@@ -888,6 +897,9 @@ int ntfs_write_begin(struct file *file, struct 
address_space *mapping,
      struct inode *inode = mapping->host;
      struct ntfs_inode *ni = ntfs_i(inode);

+    if (unlikely(ntfs3_forced_shutdown(inode->i_sb)))
+        return -EIO;
+
      *pagep = NULL;
      if (is_resident(ni)) {
          struct page *page =
@@ -1305,6 +1317,11 @@ struct inode *ntfs_create_inode(struct mnt_idmap 
*idmap, struct inode *dir,
          goto out1;
      }

+    if (unlikely(ntfs3_forced_shutdown(sb))) {
+        err = -EIO;
+        goto out2;
+    }
+
      /* Mark rw ntfs as dirty. it will be cleared at umount. */
      ntfs_set_state(sbi, NTFS_DIRTY_DIRTY);

diff --git a/fs/ntfs3/namei.c b/fs/ntfs3/namei.c
index ee3093be5170..cae41db0aaa7 100644
--- a/fs/ntfs3/namei.c
+++ b/fs/ntfs3/namei.c
@@ -181,6 +181,9 @@ static int ntfs_unlink(struct inode *dir, struct 
dentry *dentry)
      struct ntfs_inode *ni = ntfs_i(dir);
      int err;

+    if (unlikely(ntfs3_forced_shutdown(dir->i_sb)))
+        return -EIO;
+
      ni_lock_dir(ni);

      err = ntfs_unlink_inode(dir, dentry);
@@ -199,6 +202,9 @@ static int ntfs_symlink(struct mnt_idmap *idmap, 
struct inode *dir,
      u32 size = strlen(symname);
      struct inode *inode;

+    if (unlikely(ntfs3_forced_shutdown(dir->i_sb)))
+        return -EIO;
+
      inode = ntfs_create_inode(idmap, dir, dentry, NULL, S_IFLNK | 0777, 0,
                    symname, size, NULL);

@@ -227,6 +233,9 @@ static int ntfs_rmdir(struct inode *dir, struct 
dentry *dentry)
      struct ntfs_inode *ni = ntfs_i(dir);
      int err;

+    if (unlikely(ntfs3_forced_shutdown(dir->i_sb)))
+        return -EIO;
+
      ni_lock_dir(ni);

      err = ntfs_unlink_inode(dir, dentry);
@@ -264,6 +273,9 @@ static int ntfs_rename(struct mnt_idmap *idmap, 
struct inode *dir,
                1024);
      static_assert(PATH_MAX >= 4 * 1024);

+    if (unlikely(ntfs3_forced_shutdown(sb)))
+        return -EIO;
+
      if (flags & ~RENAME_NOREPLACE)
          return -EINVAL;

diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h
index f6706143d14b..d40bc7669ae5 100644
--- a/fs/ntfs3/ntfs_fs.h
+++ b/fs/ntfs3/ntfs_fs.h
@@ -61,6 +61,8 @@ enum utf16_endian;

  /* sbi->flags */
  #define NTFS_FLAGS_NODISCARD        0x00000001
+/* ntfs in shutdown state. */
+#define NTFS_FLAGS_SHUTDOWN        0x00000002
  /* Set when LogFile is replaying. */
  #define NTFS_FLAGS_LOG_REPLAYING    0x00000008
  /* Set when we changed first MFT's which copy must be updated in 
$MftMirr. */
@@ -226,7 +228,7 @@ struct ntfs_sb_info {
      u64 maxbytes; // Maximum size for normal files.
      u64 maxbytes_sparse; // Maximum size for sparse file.

-    u32 flags; // See NTFS_FLAGS_XXX.
+    unsigned long flags; // See NTFS_FLAGS_

      CLST zone_max; // Maximum MFT zone length in clusters
      CLST bad_clusters; // The count of marked bad clusters.
@@ -999,6 +1001,11 @@ static inline struct ntfs_sb_info *ntfs_sb(struct 
super_block *sb)
      return sb->s_fs_info;
  }

+static inline bool ntfs3_forced_shutdown(struct super_block *sb)
+{
+    return test_bit(NTFS_FLAGS_SHUTDOWN, &ntfs_sb(sb)->flags);
+}
+
  /*
   * ntfs_up_cluster - Align up on cluster boundary.
   */
diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
index 09d61c6c90aa..af8521a6ed95 100644
--- a/fs/ntfs3/super.c
+++ b/fs/ntfs3/super.c
@@ -714,6 +714,14 @@ static int ntfs_show_options(struct seq_file *m, 
struct dentry *root)
      return 0;
  }

+/*
+ * ntfs_shutdown - super_operations::shutdown
+ */
+static void ntfs_shutdown(struct super_block *sb)
+{
+    set_bit(NTFS_FLAGS_SHUTDOWN, &ntfs_sb(sb)->flags);
+}
+
  /*
   * ntfs_sync_fs - super_operations::sync_fs
   */
@@ -724,6 +732,9 @@ static int ntfs_sync_fs(struct super_block *sb, int 
wait)
      struct ntfs_inode *ni;
      struct inode *inode;

+    if (unlikely(ntfs3_forced_shutdown(sb)))
+        return -EIO;
+
      ni = sbi->security.ni;
      if (ni) {
          inode = &ni->vfs_inode;
@@ -763,6 +774,7 @@ static const struct super_operations ntfs_sops = {
      .put_super = ntfs_put_super,
      .statfs = ntfs_statfs,
      .show_options = ntfs_show_options,
+    .shutdown = ntfs_shutdown,
      .sync_fs = ntfs_sync_fs,
      .write_inode = ntfs3_write_inode,
  };
diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c
index 4274b6f31cfa..071356d096d8 100644
--- a/fs/ntfs3/xattr.c
+++ b/fs/ntfs3/xattr.c
@@ -744,6 +744,9 @@ static int ntfs_getxattr(const struct xattr_handler 
*handler, struct dentry *de,
      int err;
      struct ntfs_inode *ni = ntfs_i(inode);

+    if (unlikely(ntfs3_forced_shutdown(inode->i_sb)))
+        return -EIO;
+
      /* Dispatch request. */
      if (!strcmp(name, SYSTEM_DOS_ATTRIB)) {
          /* system.dos_attrib */
-- 
2.34.1

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ