Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
  Squashfs: Fix sanity check patches on big-endian systems

4 files changed, 6 insertions, 6 deletions

diff --git a/fs/squashfs/export.c b/fs/squashfs/export.c
index 730c56248c9..5e1101ff276 100644
--- a/fs/squashfs/export.c
+++ b/fs/squashfs/export.c
@@ -147,7 +147,7 @@ __le64 *squashfs_read_inode_lookup_table(struct super_block *sb,
          * table[0] points to the first inode lookup table metadata block,
          * this should be less than lookup_table_start
          */
-        if (!IS_ERR(table) && table[0] >= lookup_table_start) {
+        if (!IS_ERR(table) && le64_to_cpu(table[0]) >= lookup_table_start) {
                 kfree(table);
                 return ERR_PTR(-EINVAL);
         }
diff --git a/fs/squashfs/fragment.c b/fs/squashfs/fragment.c
index 1516a6490bf..0ed6edbc5c7 100644
--- a/fs/squashfs/fragment.c
+++ b/fs/squashfs/fragment.c
@@ -90,7 +90,7 @@ __le64 *squashfs_read_fragment_index_table(struct super_block *sb,
          * table[0] points to the first fragment table metadata block, this
          * should be less than fragment_table_start
          */
-        if (!IS_ERR(table) && table[0] >= fragment_table_start) {
+        if (!IS_ERR(table) && le64_to_cpu(table[0]) >= fragment_table_start) {
                 kfree(table);
                 return ERR_PTR(-EINVAL);
         }
diff --git a/fs/squashfs/id.c b/fs/squashfs/id.c
index a70858e0fb4..d38ea3dab95 100644
--- a/fs/squashfs/id.c
+++ b/fs/squashfs/id.c
@@ -93,7 +93,7 @@ __le64 *squashfs_read_id_index_table(struct super_block *sb,
          * table[0] points to the first id lookup table metadata block, this
          * should be less than id_table_start
          */
-        if (!IS_ERR(table) && table[0] >= id_table_start) {
+        if (!IS_ERR(table) && le64_to_cpu(table[0]) >= id_table_start) {
                 kfree(table);
                 return ERR_PTR(-EINVAL);
         }
diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index 6f26abee359..7438850c62d 100644
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@ -245,7 +245,7 @@ allocate_id_index_table:
                 msblk->id_table = NULL;
                 goto failed_mount;
         }
-        next_table = msblk->id_table[0];
+        next_table = le64_to_cpu(msblk->id_table[0]);
 
         /* Handle inode lookup table */
         lookup_table_start = le64_to_cpu(sblk->lookup_table_start);
@@ -261,7 +261,7 @@ allocate_id_index_table:
                 msblk->inode_lookup_table = NULL;
                 goto failed_mount;
         }
-        next_table = msblk->inode_lookup_table[0];
+        next_table = le64_to_cpu(msblk->inode_lookup_table[0]);
 
         sb->s_export_op = &squashfs_export_ops;
 
@@ -286,7 +286,7 @@ handle_fragments:
                 msblk->fragment_index = NULL;
                 goto failed_mount;
         }
-        next_table = msblk->fragment_index[0];
+        next_table = le64_to_cpu(msblk->fragment_index[0]);
 
 check_directory_table:
         /* Sanity check directory_table */