diff mbox series

[14/16] fs/ntfs3: Add and fix comments

Message ID 9cfeb726-0b6a-48bc-a640-435bcb6e359a@paragon-software.com (mailing list archive)
State New, archived
Headers show
Series fs/ntfs3: Bugfix and refactoring | expand

Commit Message

Konstantin Komarov Dec. 6, 2023, 3:14 p.m. UTC 
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
---
  fs/ntfs3/dir.c     | 4 +++-
  fs/ntfs3/fsntfs.c  | 2 +-
  fs/ntfs3/ntfs.h    | 2 +-
  fs/ntfs3/ntfs_fs.h | 2 +-
  4 files changed, 6 insertions(+), 4 deletions(-)

  void ntfs_get_wsl_perm(struct inode *inode);
diff mbox series

Patch

diff --git a/fs/ntfs3/dir.c b/fs/ntfs3/dir.c
index 726122ecd39b..9f6dd445eb04 100644
--- a/fs/ntfs3/dir.c
+++ b/fs/ntfs3/dir.c
@@ -536,8 +536,10 @@  static int ntfs_dir_count(struct inode *dir, bool 
*is_empty, size_t *dirs,
              e = Add2Ptr(hdr, off);
              e_size = le16_to_cpu(e->size);
              if (e_size < sizeof(struct NTFS_DE) ||
-                off + e_size > end)
+                off + e_size > end) {
+                /* Looks like corruption. */
                  break;
+            }

              if (de_is_last(e))
                  break;
diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c
index 350461d8cece..321978019407 100644
--- a/fs/ntfs3/fsntfs.c
+++ b/fs/ntfs3/fsntfs.c
@@ -2129,8 +2129,8 @@  int ntfs_insert_security(struct ntfs_sb_info *sbi,
              if (le32_to_cpu(d_security->size) == new_sec_size &&
                  d_security->key.hash == hash_key.hash &&
                  !memcmp(d_security + 1, sd, size_sd)) {
-                *security_id = d_security->key.sec_id;
                  /* Such security already exists. */
+                *security_id = d_security->key.sec_id;
                  err = 0;
                  goto out;
              }
diff --git a/fs/ntfs3/ntfs.h b/fs/ntfs3/ntfs.h
index 13e96fc63dae..c8981429c721 100644
--- a/fs/ntfs3/ntfs.h
+++ b/fs/ntfs3/ntfs.h
@@ -523,7 +523,7 @@  struct ATTR_LIST_ENTRY {
      __le64 vcn;        // 0x08: Starting VCN of this attribute.
      struct MFT_REF ref;    // 0x10: MFT record number with attribute.
      __le16 id;        // 0x18: struct ATTRIB ID.
-    __le16 name[];        // 0x1A: Just to align. To get real name can 
use name_off.
+    __le16 name[];        // 0x1A: To get real name use name_off.

  }; // sizeof(0x20)

diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h
index 7510875efef6..abbc7182554a 100644
--- a/fs/ntfs3/ntfs_fs.h
+++ b/fs/ntfs3/ntfs_fs.h
@@ -874,7 +874,7 @@  int ntfs_init_acl(struct mnt_idmap *idmap, struct 
inode *inode,

  int ntfs_acl_chmod(struct mnt_idmap *idmap, struct dentry *dentry);
  ssize_t ntfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
-extern const struct xattr_handler * const ntfs_xattr_handlers[];
+extern const struct xattr_handler *const ntfs_xattr_handlers[];

  int ntfs_save_wsl_perm(struct inode *inode, __le16 *ea_size);