Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 9 insertions, 0 deletions

diff --git a/fs/squashfs/dir.c b/fs/squashfs/dir.c
index 0dc340aa2be9..3f79cd1d0c19 100644
--- a/fs/squashfs/dir.c
+++ b/fs/squashfs/dir.c
@@ -172,6 +172,11 @@ static int squashfs_readdir(struct file *file, void *dirent, filldir_t filldir)
                 length += sizeof(dirh);
 
                 dir_count = le32_to_cpu(dirh.count) + 1;
+
+                /* dir_count should never be larger than 256 */
+                if (dir_count > 256)
+                        goto failed_read;
+
                 while (dir_count--) {
                         /*
                          * Read directory entry.
@@ -183,6 +188,10 @@ static int squashfs_readdir(struct file *file, void *dirent, filldir_t filldir)
 
                         size = le16_to_cpu(dire->size) + 1;
 
+                        /* size should never be larger than SQUASHFS_NAME_LEN */
+                        if (size > SQUASHFS_NAME_LEN)
+                                goto failed_read;
+
                         err = squashfs_read_metadata(inode->i_sb, dire->name,
                                         &block, &offset, size);
                         if (err < 0)