Unverified Commit 2fef55d8 authored by Huacai Chen's avatar Huacai Chen Committed by Konstantin Komarov
Browse files

fs/ntfs3: Update log->page_{mask,bits} if log->page_size changed 



If an NTFS file system is mounted to another system with different
PAGE_SIZE from the original system, log->page_size will change in
log_replay(), but log->page_{mask,bits} don't change correspondingly.
This will cause a panic because "u32 bytes = log->page_size - page_off"
will get a negative value in the later read_log_page().

Cc: stable@vger.kernel.org
Fixes: b46acd6a ("fs/ntfs3: Add NTFS journal")
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 5bfb91c7

fs/ntfs3/fslog.c

+3 −0
Original line number Diff line number Diff line
@@ -3922,6 +3922,9 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) 
		goto out;

	}



	log->page_mask = log->page_size - 1;

	log->page_bits = blksize_bits(log->page_size);



	/* If the file size has shrunk then we won't mount it. */

	if (log->l_size < le64_to_cpu(ra2->l_size)) {

		err = -EINVAL;