Commit 2ff55e98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents daa94222 d5b72ce1

fs/squashfs/export.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

fs/squashfs/fragment.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

fs/squashfs/id.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

fs/squashfs/super.c

+3 −3
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent) 
		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 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent) 
		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 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent) 
		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 */