From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 27 Sep 2012 21:04:53 +0000 (-0700)
Subject: 3.0-stable patches
X-Git-Tag: v3.0.44~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73e48a50221288145008a2525d0d97e3860692b4;p=thirdparty%2Fkernel%2Fstable-queue.git

3.0-stable patches

added patches:
	squashfs-fix-mount-time-sanity-check-for-corrupted-superblock.patch
---

diff --git a/queue-3.0/series b/queue-3.0/series
index 7bea516221b..23446de05c9 100644
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -116,3 +116,4 @@ media-avoid-sysfs-oops-when-an-rc_dev-s-raw-device-is-absent.patch
 pch_uart-fix-missing-break-for-16-byte-fifo.patch
 pch_uart-fix-rx-error-interrupt-setting-issue.patch
 pch_uart-fix-parity-setting-issue.patch
+squashfs-fix-mount-time-sanity-check-for-corrupted-superblock.patch
diff --git a/queue-3.0/squashfs-fix-mount-time-sanity-check-for-corrupted-superblock.patch b/queue-3.0/squashfs-fix-mount-time-sanity-check-for-corrupted-superblock.patch
new file mode 100644
index 00000000000..d68929eec8b
--- /dev/null
+++ b/queue-3.0/squashfs-fix-mount-time-sanity-check-for-corrupted-superblock.patch
@@ -0,0 +1,35 @@
+From cc37f75a9ffbbfcb1c3297534f293c8284e3c5a6 Mon Sep 17 00:00:00 2001
+From: Phillip Lougher <phillip@squashfs.org.uk>
+Date: Mon, 2 Jan 2012 17:47:14 +0000
+Subject: Squashfs: fix mount time sanity check for corrupted superblock
+
+From: Phillip Lougher <phillip@squashfs.org.uk>
+
+commit cc37f75a9ffbbfcb1c3297534f293c8284e3c5a6 upstream.
+
+A Squashfs filesystem containing nothing but an empty directory,
+although unusual and ultimately pointless, is still valid.
+
+The directory_table >= next_table sanity check rejects these
+filesystems as invalid because the directory_table is empty and
+equal to next_table.
+
+Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
+Cc: Geert Uytterhoeven <geert@linux-m68k.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/squashfs/super.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- 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;
+ 	}