Received-SPF: pass (google.com: domain of linux-kernel+bounces-8301-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <894db108-509b-4026-a90e-666a759a3f9f@paragon-software.com>
Date: Thu, 21 Dec 2023 14:35:39 +0300
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
To: <ntfs3@lists.linux.dev>
CC: <linux-kernel@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>
From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Subject: [PATCH] fs/ntfs3: Disable ATTR_LIST_ENTRY size check
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 8bit


The use of sizeof(struct ATTR_LIST_ENTRY) has been replaced with le_size(0)
due to alignment peculiarities on different platforms.

Reported-by: kernel test robot <lkp@intel.com>
Closes: 
https://lore.kernel.org/oe-kbuild-all/202312071005.g6YrbaIe-lkp@intel.com/
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
---
  fs/ntfs3/attrlist.c | 8 ++++----
  fs/ntfs3/ntfs.h     | 2 --
  2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/fs/ntfs3/attrlist.c b/fs/ntfs3/attrlist.c
index 7c01735d1219..48e7da47c6b7 100644
--- a/fs/ntfs3/attrlist.c
+++ b/fs/ntfs3/attrlist.c
@@ -127,12 +127,13 @@ struct ATTR_LIST_ENTRY *al_enumerate(struct 
ntfs_inode *ni,
  {
      size_t off;
      u16 sz;
+    const unsigned le_min_size = le_size(0);

      if (!le) {
          le = ni->attr_list.le;
      } else {
          sz = le16_to_cpu(le->size);
-        if (sz < sizeof(struct ATTR_LIST_ENTRY)) {
+        if (sz < le_min_size) {
              /* Impossible 'cause we should not return such le. */
              return NULL;
          }
@@ -141,7 +142,7 @@ struct ATTR_LIST_ENTRY *al_enumerate(struct 
ntfs_inode *ni,

      /* Check boundary. */
      off = PtrOffset(ni->attr_list.le, le);
-    if (off + sizeof(struct ATTR_LIST_ENTRY) > ni->attr_list.size) {
+    if (off + le_min_size > ni->attr_list.size) {
          /* The regular end of list. */
          return NULL;
      }
@@ -149,8 +150,7 @@ struct ATTR_LIST_ENTRY *al_enumerate(struct 
ntfs_inode *ni,
      sz = le16_to_cpu(le->size);

      /* Check le for errors. */
-    if (sz < sizeof(struct ATTR_LIST_ENTRY) ||
-        off + sz > ni->attr_list.size ||
+    if (sz < le_min_size || off + sz > ni->attr_list.size ||
          sz < le->name_off + le->name_len * sizeof(short)) {
          return NULL;
      }
diff --git a/fs/ntfs3/ntfs.h b/fs/ntfs3/ntfs.h
index c8981429c721..9c7478150a03 100644
--- a/fs/ntfs3/ntfs.h
+++ b/fs/ntfs3/ntfs.h
@@ -527,8 +527,6 @@ struct ATTR_LIST_ENTRY {

  }; // sizeof(0x20)

-static_assert(sizeof(struct ATTR_LIST_ENTRY) == 0x20);
-
  static inline u32 le_size(u8 name_len)
  {
      return ALIGN(offsetof(struct ATTR_LIST_ENTRY, name) +
-- 
2.34.1