Changeset 9e7615d in mainline

Timestamp:

2017-06-27T16:32:35Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b76ce3f

Parents:

80da8f70

Message:

Avoid misinterpreting FAT boot record as MBR.

Location:

uspace/lib/label

Files:

• include/std/fat.h (added)
• src/mbr.c (modified) (4 diffs)

uspace/lib/label/src/mbr.c

@@ -39 +39 @@
 #include <stdlib.h>
 
+#include "std/fat.h"
 #include "std/mbr.h"
 #include "mbr.h"
@@ -89 +90 @@
         label_t *label = NULL;
         mbr_br_block_t *mbr = NULL;
+        fat_bs_t *bs;
         mbr_pte_t *eptr;
         uint16_t sgn;
@@ -124 +126 @@
         }
 
+        bs = (fat_bs_t *)mbr;
+
         rc = bd->ops->read(bd->arg, mbr_ba, 1, mbr);
         if (rc != EOK) {
@@ -145 +149 @@
         }
 
+        /*
+         * We can't really tell whether this is an MBR. Make sure
+         * this is not actually the BR of a FAT file system
+         */
+        if (bs->type[0] == 'F' && bs->type[1] == 'A' && bs->type[2] == 'T') {
+                rc = EIO;
+                goto error;
+        }
 
         label->ext_part = NULL;