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

commit 2fef55d8f78383c8e6d6d4c014b9597375132696 upstream.

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: b46acd6a6a627d876898e ("fs/ntfs3: Add NTFS journal")
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
index e47c2105a24e94411f1984dd2293ea775d421160..fcb3e49911ad9a28a092d1b8a2b5e5663660bea1 100644 (file)
--- a/fs/ntfs3/fslog.c
+++ b/fs/ntfs3/fslog.c
@@ -3922,6 +3922,9 @@ check_restart_area:
                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;