Skip to content

Commit

Permalink
Squashfs: add sanity checks to xattr reading at mount time
Browse files Browse the repository at this point in the history
These checks add sanity checking of the mount-time xattr structures.

Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
  • Loading branch information
Phillip Lougher committed May 25, 2011
1 parent 76e002f commit 6f04864
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions fs/squashfs/xattr_id.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,17 @@ __le64 *squashfs_read_xattr_id_table(struct super_block *sb, u64 start,
*xattr_table_start = le64_to_cpu(id_table->xattr_table_start);
*xattr_ids = le32_to_cpu(id_table->xattr_ids);
kfree(id_table);

/* Sanity check values */

/* there is always at least one xattr id */
if (*xattr_ids == 0)
return ERR_PTR(-EINVAL);

/* xattr_table should be less than start */
if (*xattr_table_start >= start)
return ERR_PTR(-EINVAL);

len = SQUASHFS_XATTR_BLOCK_BYTES(*xattr_ids);

TRACE("In read_xattr_index_table, length %d\n", len);
Expand Down

0 comments on commit 6f04864

Please sign in to comment.