[src/trunk]: src/sys/dev Fix default label for non-standard sector size.

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

details:   https://anonhg.NetBSD.org/src/rev/0493bbc412ae
branches:  trunk
changeset: 335177:0493bbc412ae
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Mon Dec 29 13:13:20 2014 +0000

description:
Fix default label for non-standard sector size.
Avoid integer overflow in sanity check.

diffstat:

 sys/dev/vnd.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r ae8201a7554e -r 0493bbc412ae sys/dev/vnd.c
--- a/sys/dev/vnd.c     Mon Dec 29 12:53:39 2014 +0000
+++ b/sys/dev/vnd.c     Mon Dec 29 13:13:20 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vnd.c,v 1.234 2014/11/04 07:51:54 mlelstv Exp $        */
+/*     $NetBSD: vnd.c,v 1.235 2014/12/29 13:13:20 mlelstv Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.234 2014/11/04 07:51:54 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.235 2014/12/29 13:13:20 mlelstv Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vnd.h"
@@ -1284,9 +1284,9 @@
                         * Compute the size (in DEV_BSIZE blocks) specified
                         * by the geometry.
                         */
-                       geomsize = (vnd->sc_geom.vng_nsectors *
+                       geomsize = (int64_t)vnd->sc_geom.vng_nsectors *
                            vnd->sc_geom.vng_ntracks *
-                           vnd->sc_geom.vng_ncylinders) *
+                           vnd->sc_geom.vng_ncylinders *
                            (vnd->sc_geom.vng_secsize / DEV_BSIZE);
 
                        /*
@@ -1793,13 +1793,15 @@
 {
        struct vndgeom *vng = &sc->sc_geom;
        struct partition *pp;
+       unsigned spb;
 
        memset(lp, 0, sizeof(*lp));
 
-       if (sc->sc_size > UINT32_MAX)
+       spb = vng->vng_secsize / DEV_BSIZE;
+       if (sc->sc_size / spb > UINT32_MAX)
                lp->d_secperunit = UINT32_MAX;
        else
-               lp->d_secperunit = sc->sc_size;
+               lp->d_secperunit = sc->sc_size / spb;
        lp->d_secsize = vng->vng_secsize;
        lp->d_nsectors = vng->vng_nsectors;
        lp->d_ntracks = vng->vng_ntracks;