All of lore.kernel.org
 help / color / mirror / Atom feed
From: Konstantin Komarovc <almaz.alexandrovich@paragon-software.com>
To: <ntfs3@lists.linux.dev>
Cc: <linux-kernel@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>
Subject: [PATCH 14/16] fs/ntfs3: Add and fix comments
Date: Wed, 6 Dec 2023 18:14:05 +0300	[thread overview]
Message-ID: <9cfeb726-0b6a-48bc-a640-435bcb6e359a@paragon-software.com> (raw)
In-Reply-To: <00fd1558-fda5-421b-be43-7de69e32cb4e@paragon-software.com>


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(-)

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);
  void ntfs_get_wsl_perm(struct inode *inode);
-- 
2.34.1


  parent reply	other threads:[~2023-12-06 15:14 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-06 15:08 [PATCH 00/16] fs/ntfs3: Bugfix and refactoring Konstantin Komarovc
2023-12-06 15:08 ` [PATCH 01/16] fs/ntfs3: Improve alternative boot processing Konstantin Komarovc
2023-12-06 15:09 ` [PATCH 02/16] fs/ntfs3: Modified fix directory element type detection Konstantin Komarovc
2023-12-06 15:10 ` [PATCH 03/16] fs/ntfs3: Improve ntfs_dir_count Konstantin Komarovc
2023-12-06 15:10 ` [PATCH 04/16] fs/ntfs3: Correct hard links updating when dealing with DOS neams Konstantin Komarovc
2023-12-06 15:11 ` [PATCH 05/16] fs/ntfs3: Print warning while fixing hard links count Konstantin Komarovc
2023-12-06 15:11 ` [PATCH 06/16] fs/ntfs3: Reduce stack usage Konstantin Komarovc
2023-12-06 15:12 ` [PATCH 07/16] fs/ntfs3: Fix multithreaded stress test Konstantin Komarovc
2023-12-06 15:12 ` [PATCH 08/16] fs/ntfs3: Fix detected field-spanning write (size 8) of single field "le->name" Konstantin Komarovc
2023-12-07  9:31   ` Geert Uytterhoeven
2023-12-06 15:12 ` [PATCH 09/16] fs/ntfs3: Correct use bh_read Konstantin Komarovc
2023-12-06 15:12 ` [PATCH 10/16] fs/ntfs3: Add file_modified Konstantin Komarovc
2023-12-06 15:13 ` [PATCH 11/16] fs/ntfs3: Drop suid and sgid bits as a part of fpunch Konstantin Komarovc
2023-12-06 15:13 ` [PATCH 12/16] fs/ntfs3: Implement super_operations::shutdown Konstantin Komarovc
2023-12-06 15:13 ` [PATCH 13/16] fs/ntfs3: ntfs3_forced_shutdown use int instead of bool Konstantin Komarovc
2023-12-06 15:14 ` Konstantin Komarovc [this message]
2023-12-06 15:14 ` [PATCH 15/16] fs/ntfs3: Add NULL ptr dereference checking at the end of attr_allocate_frame() Konstantin Komarovc
2023-12-06 15:14 ` [PATCH 16/16] fs/ntfs3: Fix c/mtime typo Konstantin Komarovc

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9cfeb726-0b6a-48bc-a640-435bcb6e359a@paragon-software.com \
    --to=almaz.alexandrovich@paragon-software.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ntfs3@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.