Changeset 19212

Timestamp:

05/08/12 01:59:16 (13 months ago)

Author:

BrainSlayer

Message:

3.3.5

Location:

src/linux/universal/linux-3.3

Files:

• Makefile (modified) (1 diff)
• fs/hfsplus/catalog.c (modified) (1 diff)
• fs/hfsplus/dir.c (modified) (2 diffs)

src/linux/universal/linux-3.3/Makefile

@@ -2 +2 @@
 PATCHLEVEL = 3
 SUBLEVEL = 5
-EXTRAVERSION = -rc1
+EXTRAVERSION =
 NAME = Saber-toothed Squirrel
 

src/linux/universal/linux-3.3/fs/hfsplus/catalog.c

@@ -367 +367 @@
         if (err)
                 goto out;
+        if (src_fd.entrylength > sizeof(entry) || src_fd.entrylength < 0) {
+                err = -EIO;
+                goto out;
+        }
 
         hfs_bnode_read(src_fd.bnode, &entry, src_fd.entryoffset,

src/linux/universal/linux-3.3/fs/hfsplus/dir.c

@@ -151 +151 @@
                 /* fall through */
         case 1:
+                if (fd.entrylength > sizeof(entry) || fd.entrylength < 0) {
+                        err = -EIO;
+                        goto out;
+                }
+
                 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
                         fd.entrylength);
@@ -182 +187 @@
                         goto out;
                 }
+
+                if (fd.entrylength > sizeof(entry) || fd.entrylength < 0) {
+                        err = -EIO;
+                        goto out;
+                }
+
                 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
                         fd.entrylength);