Commit 6422cef5 authored by Konstantin Komarov's avatar Konstantin Komarov Committed by Wang Zhaolong
Browse files

fs/ntfs3: Check 'folio' pointer for NULL 

mainline inclusion
from mainline-v6.10-rc1
commit 1cd6c96219c429ebcfa8e79a865277376c563803
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA7D7V
CVE: CVE-2024-38625

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1cd6c96219c429ebcfa8e79a865277376c563803



--------------------------------

It can be NULL if bmap is called.

Fixes: 82cae269 ("fs/ntfs3: Add initialization of super block")
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Conflicts:
    fs/ntfs3/inode.c
[Page has not converted to a folio yet, and the alternative boot feature
has not been merged.]
Signed-off-by: default avatarWang Zhaolong <wangzhaolong1@huawei.com>
parent 3340cc60

fs/ntfs3/inode.c

+11 −6
Original line number Diff line number Diff line
@@ -565,13 +565,18 @@ static noinline int ntfs_get_block_vbo(struct inode *inode, u64 vbo, 
	}



	if (is_resident(ni)) {

		bh->b_blocknr = RESIDENT_LCN;

		bh->b_size = block_size;

		if (!page) {

			err = 0;

		} else {

			ni_lock(ni);

			err = attr_data_read_resident(ni, page);

			ni_unlock(ni);



			if (!err)

				set_buffer_uptodate(bh);

		bh->b_size = block_size;

		}

		return err;

	}