diff mbox series

[03/10] fs/ntfs3: Mark ntfs dirty when on-disk struct is corrupted

Message ID f4e07222-4f9e-e50d-a898-0583c5a168d0@paragon-software.com
State New
Headers
Series Refactoring and bugfix |

Commit Message

Konstantin Komarov May 8, 2023, 12:36 p.m. UTC 
  Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
---
  fs/ntfs3/fsntfs.c  | 2 +-
  fs/ntfs3/index.c   | 6 ++++++
  fs/ntfs3/ntfs_fs.h | 2 ++
  fs/ntfs3/record.c  | 6 ++++++
  4 files changed, 15 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c
index 28cc421102e5..21567e58265c 100644
--- a/fs/ntfs3/fsntfs.c
+++ b/fs/ntfs3/fsntfs.c
@@ -178,7 +178,7 @@  int ntfs_fix_post_read(struct NTFS_RECORD_HEADER 
*rhdr, size_t bytes,
      /* Check errors. */
      if ((fo & 1) || fo + fn * sizeof(short) > SECTOR_SIZE || !fn-- ||
          fn * SECTOR_SIZE > bytes) {
-        return -EINVAL; /* Native chkntfs returns ok! */
+        return -E_NTFS_CORRUPT;
      }

      /* Get fixup pointer. */
diff --git a/fs/ntfs3/index.c b/fs/ntfs3/index.c
index 0a48d2d67219..b40da258e684 100644
--- a/fs/ntfs3/index.c
+++ b/fs/ntfs3/index.c
@@ -1113,6 +1113,12 @@  int indx_read(struct ntfs_index *indx, struct 
ntfs_inode *ni, CLST vbn,
      *node = in;

  out:
+    if (err == -E_NTFS_CORRUPT) {
+        ntfs_inode_err(&ni->vfs_inode, "directory corrupted");
+        ntfs_set_state(ni->mi.sbi, NTFS_DIRTY_ERROR);
+        err = -EINVAL;
+    }
+
      if (ib != in->index)
          kfree(ib);

diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h
index eb01f7e76479..2e4be773728d 100644
--- a/fs/ntfs3/ntfs_fs.h
+++ b/fs/ntfs3/ntfs_fs.h
@@ -53,6 +53,8 @@  enum utf16_endian;
  #define E_NTFS_NONRESIDENT        556
  /* NTFS specific error code about punch hole. */
  #define E_NTFS_NOTALIGNED        557
+/* NTFS specific error code when on-disk struct is corrupted. */
+#define E_NTFS_CORRUPT            558


  /* sbi->flags */
diff --git a/fs/ntfs3/record.c b/fs/ntfs3/record.c
index 7060f784c2d7..7974ca35a15c 100644
--- a/fs/ntfs3/record.c
+++ b/fs/ntfs3/record.c
@@ -180,6 +180,12 @@  int mi_read(struct mft_inode *mi, bool is_mft)
      return 0;

  out:
+    if (err == -E_NTFS_CORRUPT) {
+        ntfs_err(sbi->sb, "mft corrupted");
+        ntfs_set_state(sbi, NTFS_DIRTY_ERROR);
+        err = -EINVAL;
+    }
+
      return err;
  }