From: Konstantin Komarov almaz.alexandrovich@paragon-software.com

mainline inclusion from mainline-v6.10-rc1 commit e931f6b630ffb22d66caab202a52aa8cbb10c649 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA7D1W CVE: CVE-2024-38624

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...

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

For example, in the expression: vbo = 2 * vbo + skip

Fixes: b46acd6a6a627 ("fs/ntfs3: Add NTFS journal") Signed-off-by: Konstantin Komarov almaz.alexandrovich@paragon-software.com Conflicts: fs/ntfs3/fslog.c [The `r_page` allocation position is changed] Signed-off-by: Wang Zhaolong wangzhaolong1@huawei.com --- fs/ntfs3/fslog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c index 6489953d4617..e6e38d4c582f 100644 --- a/fs/ntfs3/fslog.c +++ b/fs/ntfs3/fslog.c @@ -1179,7 +1179,8 @@ static int read_log_page(struct ntfs_log *log, u32 vbo, static int log_read_rst(struct ntfs_log *log, u32 l_size, bool first, struct restart_info *info) { - u32 skip, vbo; + u32 skip; + u64 vbo; struct RESTART_HDR *r_page = kmalloc(DefaultLogPageSize, GFP_NOFS);

if (!r_page)