Squashfs: Fix sanity check patches on big-endian systems

le64 values should be swapped when accessing on
big-endian systems.

Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>

diff --git a/fs/squashfs/export.c b/fs/squashfs/export.c
index 730c562..5e1101f 100644 (file)
--- 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
         */
         * 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);
        }
                kfree(table);
                return ERR_PTR(-EINVAL);
        }

diff --git a/fs/squashfs/fragment.c b/fs/squashfs/fragment.c
index 1516a64..0ed6edb 100644 (file)
--- 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
         */
         * 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);
        }
                kfree(table);
                return ERR_PTR(-EINVAL);
        }

diff --git a/fs/squashfs/id.c b/fs/squashfs/id.c
index a70858e..d38ea3d 100644 (file)
--- 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
         */
         * 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);
        }
                kfree(table);
                return ERR_PTR(-EINVAL);
        }

diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index 6f26abe..7438850 100644 (file)
--- 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;
        }
                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);
 
        /* 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;
        }
                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;
 
 
        sb->s_export_op = &squashfs_export_ops;
 


@@ -286,7 +286,7 @@ handle_fragments:
                msblk->fragment_index = NULL;
                goto failed_mount;
        }
                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 */
 
 check_directory_table:
        /* Sanity check directory_table */