Changeset 9f64c1e in mainline

Timestamp:

2017-07-16T17:55:23Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9ef1fade

Parents:

5772aa1

Message:

Fix fat32 EBPB packing. Fix 32-bit FAT BS being detected as MBR. Fix error path.

Location:

uspace

Files:

• lib/label/include/std/fat.h (modified) (1 diff)
• lib/label/src/mbr.c (modified) (1 diff)
• srv/fs/fat/fat.h (modified) (1 diff)
• srv/fs/fat/fat_ops.c (modified) (1 diff)

uspace/lib/label/include/std/fat.h

@@ -117 +117 @@
                         /** Signature. */
                         uint16_t        signature;
-                } fat32 __attribute__ ((packed));
+                } __attribute__ ((packed)) fat32;
         };
 } __attribute__ ((packed)) fat_bs_t;

uspace/lib/label/src/mbr.c

@@ -151 +151 @@
         /*
          * We can't really tell whether this is an MBR. Make sure
-         * this is not actually the BR of a FAT file system
+         * this is not actually the BR of a 12/16-bit FAT file system
          */
         if (bs->type[0] == 'F' && bs->type[1] == 'A' && bs->type[2] == 'T') {
+                rc = EIO;
+                goto error;
+        }
+
+        /*
+         * Or a 32-bit FAT file system
+         */
+        if (bs->fat32.type[0] == 'F' && bs->fat32.type[1] == 'A' &&
+            bs->fat32.type[2] == 'T') {
                 rc = EIO;
                 goto error;

uspace/srv/fs/fat/fat.h

@@ -136 +136 @@
                         /** Signature. */
                         uint16_t        signature;
-                } fat32 __attribute__ ((packed));
+                } __attribute__ ((packed)) fat32;
         };
 } __attribute__ ((packed)) fat_bs_t;

uspace/srv/fs/fat/fat_ops.c

@@ -1053 +1053 @@
 
         rc = fat_directory_open(nodep, &di);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                fat_fs_close(service_id, rfn);
+                return rc;
+        }
 
         rc = fat_directory_vollabel_get(&di, label);
         if (rc != EOK) {
-                if (rc != ENOENT)
+                if (rc != ENOENT) {
+                        fat_fs_close(service_id, rfn);
                         return rc;
+                }
 
                 label[0] = '\0';