fs/ntfs3: Mark ntfs dirty when on-disk struct is corrupted

[ Upstream commit e0f363a98830e8d7d70fbaf91c07ae0b7c57aafe ]

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c
index b6e22bcb929bad9a5f97555476d9f230e4a39959..829b62d3bb889fa7b2dd0b279eef25c37aa1ce5d 100644 (file)
--- a/fs/ntfs3/fsntfs.c
+++ b/fs/ntfs3/fsntfs.c
@@ -154,7 +154,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 9e9a9ffd929588a3502e3823c41eecbba29eea5b..495cfb37962faad96d22545a3ef9e5ac1500b283 100644 (file)
--- a/fs/ntfs3/index.c
+++ b/fs/ntfs3/index.c
@@ -1103,6 +1103,12 @@ ok:
        *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 24227b2e1b2b0da779ffd8ec065902fa156a3813..8c9abaf139e67b0e5f31603b3dfdecd010a6fbeb 100644 (file)
--- 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 07037ec773ac8b7824f4e43dbcad03ae4a6306bb..ba336c7280b852ecfa8b072dbe7ca00c5761f83a 100644 (file)
--- a/fs/ntfs3/record.c
+++ b/fs/ntfs3/record.c
@@ -180,6 +180,12 @@ ok:
        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;
 }