Skip to content

Commit b2dd7b9

Browse files
Dan Carpenteraalexandrovich
authored andcommitted
fs/ntfs3: Fix an NULL dereference bug
The issue here is when this is called from ntfs_load_attr_list(). The "size" comes from le32_to_cpu(attr->res.data_size) so it can't overflow on a 64bit systems but on 32bit systems the "+ 1023" can overflow and the result is zero. This means that the kmalloc will succeed by returning the ZERO_SIZE_PTR and then the memcpy() will crash with an Oops on the next line. Fixes: be71b5c ("fs/ntfs3: Add attrib operations") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
1 parent d689684 commit b2dd7b9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/ntfs3/ntfs_fs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ bool al_delete_le(struct ntfs_inode *ni, enum ATTR_TYPE type, CLST vcn,
475475
int al_update(struct ntfs_inode *ni, int sync);
476476
static inline size_t al_aligned(size_t size)
477477
{
478-
return (size + 1023) & ~(size_t)1023;
478+
return size_add(size, 1023) & ~(size_t)1023;
479479
}
480480

481481
/* Globals from bitfunc.c */

0 commit comments

Comments
 (0)