Unverified Commit 4cdfb6e7 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Disable ATTR_LIST_ENTRY size check 



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

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202312071005.g6YrbaIe-lkp@intel.com/


Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 652483bf

fs/ntfs3/attrlist.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}

fs/ntfs3/ntfs.h

+0 −2
Original line number Diff line number Diff line
@@ -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) +