[PATCH] fs/ntfs3: Disable ATTR_LIST_ENTRY size check

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




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@xxxxxxxxx>
Closes: https://lore.kernel.org/oe-kbuild-all/202312071005.g6YrbaIe-lkp@xxxxxxxxx/
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@xxxxxxxxxxxxxxxxxxxx>
---
 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





[Index of Archives]     [Linux Ext4 Filesystem]     [Union Filesystem]     [Filesystem Testing]     [Ceph Users]     [Ecryptfs]     [NTFS 3]     [AutoFS]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux Cachefs]     [Reiser Filesystem]     [Linux RAID]     [NTFS 3]     [Samba]     [Device Mapper]     [CEPH Development]

  Powered by Linux