read_fs: check metadata blocks are expected size in scan_inode_table()

Note we can't use expected in read_block() here because at the time
of calling read_block() we don't know what the expected size is.

Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>

1 files changed, 12 insertions, 0 deletions

diff --git a/squashfs-tools/read_fs.c b/squashfs-tools/read_fs.c
index 6fa7a71..b038193 100644
--- a/squashfs-tools/read_fs.c
+++ b/squashfs-tools/read_fs.c
@@ -156,7 +156,19 @@ int scan_inode_table(int fd, long long start, long long end,
 			free(*inode_table);
 			return FALSE;
 		}
+
 		bytes += byte;
+
+		/* If this is not the last metadata block in the inode table
+		 * then it should be SQUASHFS_METADATA_SIZE in size.
+		 * Note, we can't use expected in read_block() above for this
+		 * because we don't know if this is the last block until
+		 * after reading.
+		 */
+		if(start != end && byte != SQUASHFS_METADATA_SIZE) {
+			free(*inode_table);
+			return FALSE;
+		}
 	}
 
 	/*