Commit 49702d6c authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Long Li
Browse files

fs/ntfs3: add prefix to bitmap_size() and use BITS_TO_U64() 

mainline inclusion
from mainline-v6.9-rc1
commit 3f5ef5109f6a054ce58b3bec7214ed76c9cc269f
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAQOJ9
CVE: CVE-2024-45025

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



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

bitmap_size() is a pretty generic name and one may want to use it for
a generic bitmap API function. At the same time, its logic is
NTFS-specific, as it aligns to the sizeof(u64), not the sizeof(long)
(although it uses ideologically right ALIGN() instead of division).
Add the prefix 'ntfs3_' used for that FS (not just 'ntfs_' to not mix
it with the legacy module) and use generic BITS_TO_U64() while at it.

Suggested-by: Yury Norov <yury.norov@gmail.com> # BITS_TO_U64()
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarYury Norov <yury.norov@gmail.com>
Signed-off-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Conflicts:
	fs/ntfs3/super.c
	fs/ntfs3/index.c
[Context changed and there is no logical conflict.]
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent 5a1d9701

fs/ntfs3/bitmap.c

+2 −2
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ int wnd_init(struct wnd_bitmap *wnd, struct super_block *sb, size_t nbits) 
	wnd->total_zeroes = nbits;

	wnd->extent_max = MINUS_ONE_T;

	wnd->zone_bit = wnd->zone_end = 0;

	wnd->nwnd = bytes_to_block(sb, bitmap_size(nbits));

	wnd->nwnd = bytes_to_block(sb, ntfs3_bitmap_size(nbits));

	wnd->bits_last = nbits & (wbits - 1);

	if (!wnd->bits_last)

		wnd->bits_last = wbits;
@@ -1323,7 +1323,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits) 
		return -EINVAL;



	/* Align to 8 byte boundary. */

	new_wnd = bytes_to_block(sb, bitmap_size(new_bits));

	new_wnd = bytes_to_block(sb, ntfs3_bitmap_size(new_bits));

	new_last = new_bits & (wbits - 1);

	if (!new_last)

		new_last = wbits;

fs/ntfs3/fsntfs.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int ntfs_extend_mft(struct ntfs_sb_info *sbi) 
	ni->mi.dirty = true;



	/* Step 2: Resize $MFT::BITMAP. */

	new_bitmap_bytes = bitmap_size(new_mft_total);

	new_bitmap_bytes = ntfs3_bitmap_size(new_mft_total);



	err = attr_set_size(ni, ATTR_BITMAP, NULL, 0, &sbi->mft.bitmap.run,

			    new_bitmap_bytes, &new_bitmap_bytes, true, NULL);

fs/ntfs3/index.c

+6 −5
Original line number Diff line number Diff line
@@ -1428,8 +1428,8 @@ static int indx_create_allocate(struct ntfs_index *indx, struct ntfs_inode *ni, 


	alloc->nres.valid_size = alloc->nres.data_size = cpu_to_le64(data_size);



	err = ni_insert_resident(ni, bitmap_size(1), ATTR_BITMAP, in->name,

				 in->name_len, &bitmap, NULL, NULL);

	err = ni_insert_resident(ni, ntfs3_bitmap_size(1), ATTR_BITMAP,

				 in->name, in->name_len, &bitmap, NULL, NULL);

	if (err)

		goto out2;
@@ -1490,8 +1490,9 @@ static int indx_add_allocate(struct ntfs_index *indx, struct ntfs_inode *ni, 
	if (bmp) {

		/* Increase bitmap. */

		err = attr_set_size(ni, ATTR_BITMAP, in->name, in->name_len,

				    &indx->bitmap_run, bitmap_size(bit + 1),

				    NULL, true, NULL);

				    &indx->bitmap_run,

				    ntfs3_bitmap_size(bit + 1), NULL, true,

				    NULL);

		if (err)

			goto out1;

	}
@@ -2048,7 +2049,7 @@ static int indx_shrink(struct ntfs_index *indx, struct ntfs_inode *ni, 
	if (err)

		return err;



	bpb = bitmap_size(bit);

	bpb = ntfs3_bitmap_size(bit);

	if (bpb * 8 == nbits)

		return 0;

fs/ntfs3/ntfs_fs.h

+2 −2
Original line number Diff line number Diff line
@@ -944,9 +944,9 @@ static inline bool run_is_empty(struct runs_tree *run) 
}



/* NTFS uses quad aligned bitmaps. */

static inline size_t bitmap_size(size_t bits)

static inline size_t ntfs3_bitmap_size(size_t bits)

{

	return ALIGN((bits + 7) >> 3, 8);

	return BITS_TO_U64(bits) * sizeof(u64);

}



#define _100ns2seconds 10000000

fs/ntfs3/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1096,7 +1096,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) 


	/* Check bitmap boundary. */

	tt = sbi->used.bitmap.nbits;

	if (inode->i_size < bitmap_size(tt)) {

	if (inode->i_size < ntfs3_bitmap_size(tt)) {

		err = -EINVAL;

		goto put_inode_out;

	}