[src/trunk]: src/sbin/cgdconfig Add validation methods "mbr" and "gpt" for di...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b475de6f6ba8
branches:  trunk
changeset: 805038:b475de6f6ba8
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Dec 14 12:31:39 2014 +0000

description:
Add validation methods "mbr" and "gpt" for disks without a valid disklabel.

diffstat:

 sbin/cgdconfig/cgdconfig.8 |    6 +-
 sbin/cgdconfig/cgdconfig.c |  141 ++++++++++++++++++++++++++++++++++++++++++++-
 sbin/cgdconfig/params.c    |   14 +++-
 sbin/cgdconfig/params.h    |    4 +-
 4 files changed, 158 insertions(+), 7 deletions(-)

diffs (271 lines):

diff -r 8da568fdf535 -r b475de6f6ba8 sbin/cgdconfig/cgdconfig.8
--- a/sbin/cgdconfig/cgdconfig.8        Sun Dec 14 11:31:39 2014 +0000
+++ b/sbin/cgdconfig/cgdconfig.8        Sun Dec 14 12:31:39 2014 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: cgdconfig.8,v 1.33 2012/12/05 08:56:54 wiz Exp $
+.\" $NetBSD: cgdconfig.8,v 1.34 2014/12/14 12:31:39 mlelstv Exp $
 .\"
 .\" Copyright (c) 2002, The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -208,6 +208,10 @@
 perform no verification.
 .It disklabel
 scan for a valid disklabel.
+.It mbr
+scan for a valid Master Boot Record.
+.It gpt
+scan for a valid GUUID partition table.
 .It ffs
 scan for a valid FFS file system.
 .It re-enter
diff -r 8da568fdf535 -r b475de6f6ba8 sbin/cgdconfig/cgdconfig.c
--- a/sbin/cgdconfig/cgdconfig.c        Sun Dec 14 11:31:39 2014 +0000
+++ b/sbin/cgdconfig/cgdconfig.c        Sun Dec 14 12:31:39 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.36 2014/12/14 11:31:39 mlelstv Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.37 2014/12/14 12:31:39 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 2002, 2003\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.36 2014/12/14 11:31:39 mlelstv Exp $");
+__RCSID("$NetBSD: cgdconfig.c,v 1.37 2014/12/14 12:31:39 mlelstv Exp $");
 #endif
 
 #include <err.h>
@@ -49,7 +49,9 @@
 #include <dirent.h>
 
 #include <sys/ioctl.h>
+#include <sys/bootblock.h>
 #include <sys/disklabel.h>
+#include <sys/disklabel_gpt.h>
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/resource.h>
@@ -119,6 +121,8 @@
 static int      verify_disklabel(int);
 static int      verify_ffs(int);
 static int      verify_reenter(struct params *);
+static int      verify_mbr(int);
+static int      verify_gpt(int);
 
 __dead static void      usage(void);
 
@@ -751,6 +755,10 @@
                return verify_ffs(fd);
        case VERIFY_REENTER:
                return verify_reenter(p);
+       case VERIFY_MBR:
+               return verify_mbr(fd);
+       case VERIFY_GPT:
+               return verify_gpt(fd);
        default:
                warnx("unimplemented verification method");
                return -1;
@@ -771,7 +779,7 @@
         * partition information.
         */
 
-       ret = prog_pread(fd, buf, 8192, 0);
+       ret = prog_pread(fd, buf, SCANSIZE, 0);
        if (ret < 0) {
                warn("can't read disklabel area");
                return -1;
@@ -782,6 +790,133 @@
        return disklabel_scan(&l, buf, (size_t)ret);
 }
 
+static int
+verify_mbr(int fd)
+{
+       struct mbr_sector mbr;
+       ssize_t ret;
+       char    buf[SCANSIZE];
+
+       /*
+        * we read the first blocks to avoid sector size issues and
+        * verify the MBR in the beginning
+        */
+
+       ret = prog_pread(fd, buf, SCANSIZE, 0);
+       if (ret < 0) {
+               warn("can't read mbr area");
+               return -1;
+       }
+
+       memcpy(&mbr, buf, sizeof(mbr));
+       if (le16toh(mbr.mbr_magic) != MBR_MAGIC)
+               return -1;
+
+       return 0;
+}
+
+static uint32_t crc32_tab[] = {
+       0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+       0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+       0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+       0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+       0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+       0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+       0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+       0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+       0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+       0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+       0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+       0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+       0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+       0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+       0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+       0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+       0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+       0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+       0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+       0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+       0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+       0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+       0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+       0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+       0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+       0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+       0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+       0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+       0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+       0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+       0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+       0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+       0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+       0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+       0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+       0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+       0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+       0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+       0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+       0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+       0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+       0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+       0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
+
+static uint32_t
+crc32(const void *buf, size_t size)
+{
+       const uint8_t *p;
+       uint32_t crc;
+
+       p = buf;
+       crc = ~0U;
+
+       while (size--)
+               crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8);
+
+       return crc ^ ~0U;
+}
+
+static int
+verify_gpt(int fd)
+{
+       struct   gpt_hdr hdr;
+       ssize_t  ret;
+       char     buf[SCANSIZE];
+       unsigned blksize;
+       size_t   off;
+
+       /*
+        * we read the first blocks to avoid sector size issues and
+        * verify the GPT header.
+        */
+
+       ret = prog_pread(fd, buf, SCANSIZE, 0);
+       if (ret < 0) {
+               warn("can't read gpt area");
+               return -1;
+       }
+
+       ret = -1;
+       for (blksize=DEV_BSIZE;
+             (off = blksize * GPT_HDR_BLKNO) <= SCANSIZE - sizeof(hdr);
+             blksize <<= 1) {
+
+               memcpy(&hdr, &buf[off], sizeof(hdr));
+               if (memcmp(hdr.hdr_sig, GPT_HDR_SIG, sizeof(hdr.hdr_sig)) == 0 &&
+                   le32toh(hdr.hdr_revision) == GPT_HDR_REVISION &&
+                   le32toh(hdr.hdr_size) == GPT_HDR_SIZE) {
+
+                       hdr.hdr_crc_self = 0;
+                       if (crc32(&hdr, sizeof(hdr))) {
+                               ret = 0;
+                               break;
+                       }
+               }
+       }
+
+       return ret;
+}
+
 static off_t sblock_try[] = SBLOCKSEARCH;
 
 static int
diff -r 8da568fdf535 -r b475de6f6ba8 sbin/cgdconfig/params.c
--- a/sbin/cgdconfig/params.c   Sun Dec 14 11:31:39 2014 +0000
+++ b/sbin/cgdconfig/params.c   Sun Dec 14 12:31:39 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: params.c,v 1.24 2008/09/12 16:51:55 christos Exp $ */
+/* $NetBSD: params.c,v 1.25 2014/12/14 12:31:39 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: params.c,v 1.24 2008/09/12 16:51:55 christos Exp $");
+__RCSID("$NetBSD: params.c,v 1.25 2014/12/14 12:31:39 mlelstv Exp $");
 #endif
 
 #include <sys/types.h>
@@ -268,6 +268,10 @@
                p->verify_method = VERIFY_FFS;
        if (!strcmp("re-enter", vm))
                p->verify_method = VERIFY_REENTER;
+       if (!strcmp("mbr", vm))
+               p->verify_method = VERIFY_MBR;
+       if (!strcmp("gpt", vm))
+               p->verify_method = VERIFY_GPT;
 
        string_free(in);
 
@@ -765,6 +769,12 @@
        case VERIFY_REENTER:
                print_kvpair_cstr(f, ts, "verify_method", "re-enter");
                break;
+       case VERIFY_MBR:
+               print_kvpair_cstr(f, ts, "verify_method", "mbr");
+               break;
+       case VERIFY_GPT:
+               print_kvpair_cstr(f, ts, "verify_method", "gpt");
+               break;
        default:
                warnx("unsupported verify_method (%d)", p->verify_method);
                return -1;
diff -r 8da568fdf535 -r b475de6f6ba8 sbin/cgdconfig/params.h
--- a/sbin/cgdconfig/params.h   Sun Dec 14 11:31:39 2014 +0000
+++ b/sbin/cgdconfig/params.h   Sun Dec 14 12:31:39 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: params.h,v 1.10 2008/05/11 03:15:21 elric Exp $ */
+/* $NetBSD: params.h,v 1.11 2014/12/14 12:31:39 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -71,6 +71,8 @@
 #define VERIFY_DISKLABEL       0x2
 #define VERIFY_FFS             0x3
 #define VERIFY_REENTER         0x4
+#define VERIFY_MBR             0x5
+#define VERIFY_GPT             0x6
 
 __BEGIN_DECLS
 struct params  *params_new(void);