diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-13 19:34:57 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-13 19:34:57 +0100 |
| commit | 96e80a7851b44f3decaac0625665cd64e550b71d (patch) | |
| tree | a24d9f46c43b5fcf824c49b93d37982ab668aade /fs/squashfs/super.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw (diff) | |
| parent | Squashfs: fix i_blocks calculation with extended regular files (diff) | |
| download | linux-96e80a7851b44f3decaac0625665cd64e550b71d.tar.xz linux-96e80a7851b44f3decaac0625665cd64e550b71d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
Squashfs: fix i_blocks calculation with extended regular files
Squashfs: fix mount time sanity check for corrupted superblock
Squashfs: optimise squashfs_cache_get entry search
Squashfs: Update documentation to include xattrs
Squashfs: add missing block release on error condition
Diffstat (limited to 'fs/squashfs/super.c')
| -rw-r--r-- | fs/squashfs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c index d0858c2d9a47..ecaa2f7bdb8f 100644 --- a/fs/squashfs/super.c +++ b/fs/squashfs/super.c @@ -290,7 +290,7 @@ handle_fragments: check_directory_table: /* Sanity check directory_table */ - if (msblk->directory_table >= next_table) { + if (msblk->directory_table > next_table) { err = -EINVAL; goto failed_mount; } |