1 files changed, 5 insertions, 0 deletions

diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index 970b1167e7cb..29cd014ed3a1 100644
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@ -158,10 +158,15 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
                 goto failed_mount;
         }
 
+        /* Check block log for sanity */
         msblk->block_log = le16_to_cpu(sblk->block_log);
         if (msblk->block_log > SQUASHFS_FILE_MAX_LOG)
                 goto failed_mount;
 
+        /* Check that block_size and block_log match */
+        if (msblk->block_size != (1 << msblk->block_log))
+                goto failed_mount;
+
         /* Check the root inode for sanity */
         root_inode = le64_to_cpu(sblk->root_inode);
         if (SQUASHFS_INODE_OFFSET(root_inode) > SQUASHFS_METADATA_SIZE)