Changeset b0ac906b283b428ba1c7f35fe1e71a84b3d3d9c6 for libinstaller

Timestamp:

09/07/11 07:19:05 (9 months ago)

Author:

Paulo Alcantara <pcacjr@…>

Children:

045bc5cd1118fee51b19d89dc316038c8a93e5bf

Parents:

67954e370003d9bbfd8b58042669f2e9d532636f

git-author:

Paulo Alcantara <pcacjr@gmail.com> / 2011-07-05T21:32:51Z+0000

git-committer:

Paulo Alcantara <pcacjr@gmail.com> / 2011-09-07T07:19:05Z+0000

Message:

Add NTFS filesystem support to Linux and Windows installers

Signed-off-by: Paulo Alcantara <pcacjr@…>

Location:

libinstaller

Files:

• fs.c (moved) (moved from libinstaller/fat.c) (6 diffs)
• linuxioctl.h (modified) (2 diffs)
• setadv.c (modified) (1 diff)
• syslinux.h (modified) (1 diff)
• syslxcom.c (modified) (3 diffs)
• syslxcom.h (modified) (1 diff)
• syslxfs.h (added)
• syslxint.h (modified) (3 diffs)
• syslxmod.c (modified) (1 diff)
• syslxopt.c (modified) (1 diff)

libinstaller/fs.c

@@ -1 +1 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 1998-2008 H. Peter Anvin - All Rights Reserved
- *   Copyright 2009-2010 Intel Corporation; author H. Peter Anvin
+ *   Copyright 1998-2011 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2009-2011 Intel Corporation; author H. Peter Anvin
+ *   Copyright 2011 Paulo Alcantara <pcacjr@gmail.com>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -13 +14 @@
 
 /*
- * fat.c - Initial sanity check for FAT-based installers
+ * fs.c - Generic sanity check for FAT/NTFS-based installers
  */
 
@@ -26 +27 @@
 #include "syslinux.h"
 #include "syslxint.h"
+#include "syslxcom.h"
+#include "syslxfs.h"
 
-void syslinux_make_bootsect(void *bs)
+void syslinux_make_bootsect(void *bs, int fs_type)
 {
-    struct boot_sector *bootsect = bs;
-    const struct boot_sector *sbs =
-        (const struct boot_sector *)boot_sector;
+    if (fs_type == VFAT) {
+        struct fat_boot_sector *bootsect = bs;
+        const struct fat_boot_sector *sbs =
+            (const struct fat_boot_sector *)boot_sector;
 
-    memcpy(&bootsect->bsHead, &sbs->bsHead, bsHeadLen);
-    memcpy(&bootsect->bsCode, &sbs->bsCode, bsCodeLen);
+        memcpy(&bootsect->FAT_bsHead, &sbs->FAT_bsHead, FAT_bsHeadLen);
+        memcpy(&bootsect->FAT_bsCode, &sbs->FAT_bsCode, FAT_bsCodeLen);
+    } else if (fs_type == NTFS) {
+        struct ntfs_boot_sector *bootsect = bs;
+        const struct ntfs_boot_sector *sbs =
+            (const struct ntfs_boot_sector *)boot_sector;
+
+        memcpy(&bootsect->NTFS_bsHead, &sbs->NTFS_bsHead, NTFS_bsHeadLen);
+        memcpy(&bootsect->NTFS_bsCode, &sbs->NTFS_bsCode, NTFS_bsCodeLen);
+    }
 }
 
-/*
- * Check to see that what we got was indeed an MS-DOS boot sector/superblock;
- * Return NULL if OK and otherwise an error message;
- */
-const char *syslinux_check_bootsect(const void *bs)
+static const char *check_fat_bootsect(const void *bs, int *fs_type)
 {
     int sectorsize;
+    const struct fat_boot_sector *sectbuf = bs;
     long long sectors, fatsectors, dsectors;
     long long clusters;
     int rootdirents, clustersize;
-    const struct boot_sector *sectbuf = bs;
-
-    /* Must be 0xF0 or 0xF8..0xFF */
-    if (get_8(&sectbuf->bsMedia) != 0xF0 && get_8(&sectbuf->bsMedia) < 0xF8)
-        return "invalid media signature (not a FAT filesystem?)";
 
     sectorsize = get_16(&sectbuf->bsBytesPerSec);
-    if (sectorsize == SECTOR_SIZE)
-        ;                       /* ok */
-    else if (sectorsize >= 512 && sectorsize <= 4096 &&
-             (sectorsize & (sectorsize - 1)) == 0)
-        return "unsupported sectors size";
-    else
-        return "impossible sector size";
 
     clustersize = get_8(&sectbuf->bsSecPerClust);
     if (clustersize == 0 || (clustersize & (clustersize - 1)))
-        return "impossible cluster size";
+        return "impossible cluster size on an FAT volume";
 
     sectors = get_16(&sectbuf->bsSectors);
@@ -80 +77 @@
 
     if (dsectors < 0)
-        return "negative number of data sectors";
-
-    if (fatsectors == 0)
-        return "zero FAT sectors";
+        return "negative number of data sectors on an FAT volume";
 
     clusters = dsectors / clustersize;
 
+    fatsectors = get_16(&sectbuf->bsFATsecs);
+    fatsectors = fatsectors ? fatsectors : get_32(&sectbuf->bs32.FATSz32);
+    fatsectors *= get_8(&sectbuf->bsFATs);
+
+    if (!fatsectors)
+        return "zero FAT sectors";
+
     if (clusters < 0xFFF5) {
         /* FAT12 or FAT16 */
-
         if (!get_16(&sectbuf->bsFATsecs))
             return "zero FAT sectors (FAT12/16)";
@@ -101 +101 @@
                     return "less than 4084 clusters but claims FAT16";
             } else if (!memcmp(&sectbuf->bs16.FileSysType, "FAT32   ", 8)) {
-                    return "less than 65525 clusters but claims FAT32";
+                return "less than 65525 clusters but claims FAT32";
             } else if (memcmp(&sectbuf->bs16.FileSysType, "FAT     ", 8)) {
-                static char fserr[] =
-                    "filesystem type \"????????\" not supported";
+                static char fserr[] = "filesystem type \"????????\" not "
+                    "supported";
                 memcpy(fserr + 17, &sectbuf->bs16.FileSysType, 8);
                 return fserr;
@@ -120 +120 @@
             return "missing FAT32 signature";
     } else {
-        return "impossibly large number of clusters";
+        return "impossibly large number of clusters on an FAT volume";
     }
+
+    if (fs_type)
+        *fs_type = VFAT;
 
     return NULL;
 }
+
+static const char *check_ntfs_bootsect(const void *bs, int *fs_type)
+{
+    const struct ntfs_boot_sector *sectbuf = bs;
+
+    if (memcmp(&sectbuf->bsOemName, "NTFS    ", 8) &&
+        memcmp(&sectbuf->bsOemName, "MSWIN4.0", 8) &&
+        memcmp(&sectbuf->bsOemName, "MSWIN4.1", 8))
+        return "unknown OEM name but claims NTFS";
+
+    if (fs_type)
+        *fs_type = NTFS;
+
+    return NULL;
+}
+
+const char *syslinux_check_bootsect(const void *bs, int *fs_type)
+{
+    uint8_t media_sig;
+    int sectorsize;
+    const struct fat_boot_sector *sectbuf = bs;
+    const char *retval;
+
+    media_sig = get_8(&sectbuf->bsMedia);
+    /* Must be 0xF0 or 0xF8-0xFF for FAT/NTFS volumes */
+    if (media_sig != 0xF0 && media_sig < 0xF8)
+        return "invalid media signature (not an FAT/NTFS volume?)";
+
+    sectorsize = get_16(&sectbuf->bsBytesPerSec);
+    if (sectorsize == SECTOR_SIZE) ;    /* ok */
+    else if (sectorsize >= 512 && sectorsize <= 4096 &&
+             (sectorsize & (sectorsize - 1)) == 0)
+        return "unsupported sectors size";
+    else
+        return "impossible sector size";
+
+    if (ntfs_check_zero_fields((struct ntfs_boot_sector *)bs))
+        retval = check_ntfs_bootsect(bs, fs_type);
+    else
+        retval = check_fat_bootsect(bs, fs_type);
+
+    return retval;
+}

libinstaller/linuxioctl.h

@@ -16 +16 @@
 
 #include <linux/fs.h>           /* FIGETBSZ, FIBMAP, FS_IOC_FIEMAP */
-#include <linux/msdos_fs.h>     /* FAT_IOCTL_SET_ATTRIBUTES */
 
 #undef SECTOR_SIZE              /* Defined in msdos_fs.h for no good reason */
@@ -26 +25 @@
 #endif
 
-#ifndef FAT_IOCTL_SET_ATTRIBUTES
-# define FAT_IOCTL_SET_ATTRIBUTES       _IOW('r', 0x11, __u32)
-#endif
+#define FAT_IOCTL_SET_ATTRIBUTES        _IOW('r', 0x11, __u32)
 
 #include <linux/fiemap.h>       /* FIEMAP definitions */

libinstaller/setadv.c

@@ -31 +31 @@
 #include "syslxint.h"
 #include "syslxcom.h"
+#include "syslxfs.h"
 
 unsigned char syslinux_adv[2 * ADV_SIZE];

libinstaller/syslinux.h

@@ -41 +41 @@
 
 /* This takes a boot sector and merges in the syslinux fields */
-void syslinux_make_bootsect(void *);
+void syslinux_make_bootsect(void *bs, int fs_type);
 
 /* Check to see that what we got was indeed an MS-DOS boot sector/superblock */
-const char *syslinux_check_bootsect(const void *bs);
+const char *syslinux_check_bootsect(const void *bs, int *fs_type);
 
 /* This patches the boot sector and ldlinux.sys based on a sector map */

libinstaller/syslxcom.c

@@ -31 +31 @@
 #include <sys/mount.h>
 #include <sys/vfs.h>
+
 #include "linuxioctl.h"
 #include "syslxcom.h"
+#include "syslxfs.h"
 
 const char *program;
@@ -134 +136 @@
             break;
         }
+    case NTFS:
+        break;
         default:
             break;
@@ -164 +168 @@
             break;
         }
+    case NTFS:
+        break;
         default:
             break;

libinstaller/syslxcom.h

@@ -4 +4 @@
 #include "syslinux.h"
 
-/* Global fs_type for handling fat, ext2/3/4 and btrfs */
-enum filesystem {
-    NONE,
-    EXT2,
-    BTRFS,
-    VFAT,
-};
-
-extern int fs_type;
 extern const char *program;
 ssize_t xpread(int fd, void *buf, size_t count, off_t offset);

libinstaller/syslxint.h

@@ -3 +3 @@
  *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *   Copyright 2009-2011 Intel Corporation; author: H. Peter Anvin
+ *   Copyright 2011 Paulo Alcantara <pcacjr@gmail.com>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -193 +194 @@
 
 /* FAT bootsector format, also used by other disk-based derivatives */
-struct boot_sector {
+struct fat_boot_sector {
     uint8_t bsJump[3];
     char bsOemName[8];
@@ -242 +243 @@
 } __attribute__ ((packed));
 
-#define bsHead      bsJump
-#define bsHeadLen   offsetof(struct boot_sector, bsBytesPerSec)
-#define bsCode      bs32.Code   /* The common safe choice */
-#define bsCodeLen   (offsetof(struct boot_sector, bsSignature) - \
-                     offsetof(struct boot_sector, bsCode))
-
-static inline int fat_check_sb_fields(const struct boot_sector *sb)
+/* NTFS bootsector format */
+struct ntfs_boot_sector {
+    uint8_t bsJump[3];
+    char bsOemName[8];
+    uint16_t bsBytesPerSec;
+    uint8_t bsSecPerClust;
+    uint16_t bsResSectors;
+    uint8_t bsZeroed_0[3];
+    uint16_t bsZeroed_1;
+    uint8_t bsMedia;
+    uint16_t bsZeroed_2;
+    uint16_t bsUnused_0;
+    uint16_t bsUnused_1;
+    uint32_t bsUnused_2;
+    uint32_t bsZeroed_3;
+    uint32_t bsUnused_3;
+    uint64_t bsTotalSectors;
+    uint64_t bsMFTLogicalClustNr;
+    uint64_t bsMFTMirrLogicalClustNr;
+    uint8_t bsClustPerMFTrecord;
+    uint8_t bsUnused_4[3];
+    uint8_t bsClustPerIdxBuf;
+    uint8_t bsUnused_5[3];
+    uint64_t bsVolSerialNr;
+    uint32_t bsUnused_6;
+
+    uint8_t Code[420];
+
+    uint32_t bsMagic;
+    uint16_t bsForwardPtr;
+    uint16_t bsSignature;
+} __attribute__((packed));
+
+#define FAT_bsHead      bsJump
+#define FAT_bsHeadLen   offsetof(struct fat_boot_sector, bsBytesPerSec)
+#define FAT_bsCode          bs32.Code   /* The common safe choice */
+#define FAT_bsCodeLen   (offsetof(struct fat_boot_sector, bsSignature) - \
+                     offsetof(struct fat_boot_sector, FAT_bsCode))
+
+#define NTFS_bsHead     bsJump
+#define NTFS_bsHeadLen  offsetof(struct ntfs_boot_sector, bsOemName)
+#define NTFS_bsCode     Code
+#define NTFS_bsCodeLen  (offsetof(struct ntfs_boot_sector, bsSignature) - \
+                            offsetof(struct ntfs_boot_sector, NTFS_bsCode))
+
+/* Check if there are specific zero fields in an NTFS boot sector */
+static inline int ntfs_check_zero_fields(const struct ntfs_boot_sector *sb)
+{
+    return !sb->bsResSectors && (!sb->bsZeroed_0[0] && !sb->bsZeroed_0[1] &&
+            !sb->bsZeroed_0[2]) && !sb->bsZeroed_1 && !sb->bsZeroed_2 &&
+            !sb->bsZeroed_3;
+}
+
+static inline int ntfs_check_sb_fields(const struct ntfs_boot_sector *sb)
+{
+    return ntfs_check_zero_fields(sb) &&
+            (!memcmp(sb->bsOemName, "NTFS    ", 8) ||
+             !memcmp(sb->bsOemName, "MSWIN4.0", 8) ||
+             !memcmp(sb->bsOemName, "MSWIN4.1", 8));
+}
+
+static inline int fat_check_sb_fields(const struct fat_boot_sector *sb)
 {
     return sb->bsResSectors && sb->bsFATs &&

libinstaller/syslxmod.c

@@ -110 +110 @@
     uint32_t csum;
     int i, dw, nptrs;
-    struct boot_sector *sbs = (struct boot_sector *)boot_sector;
+    struct fat_boot_sector *sbs = (struct fat_boot_sector *)boot_sector;
     uint64_t *advptrs;
 

libinstaller/syslxopt.c

@@ -26 +26 @@
 #include "../version.h"
 #include "syslxcom.h"
+#include "syslxfs.h"
 #include "syslxopt.h"