auto import from //branches/cupcake_rel/...@140373
diff --git a/vold/blkdev.c b/vold/blkdev.c
index 981d0f2..3167507 100644
--- a/vold/blkdev.c
+++ b/vold/blkdev.c
@@ -134,8 +134,12 @@
         struct dos_partition part;
         int part_no = blk->minor -1;
 
-        dos_partition_dec(block + DOSPARTOFF + part_no * sizeof(struct dos_partition), &part);
-        blk->part_type = part.dp_typ;
+        if (part_no < 4) {
+            dos_partition_dec(block + DOSPARTOFF + part_no * sizeof(struct dos_partition), &part);
+            blk->part_type = part.dp_typ;
+        } else {
+            LOGW("Skipping partition %d", part_no);
+        }
     }
 
  out: