src: Pull up following revision(s) (requested by christos in tic...

[Repository Conversion <srcmastr%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d32c0ee66815
branches:  netbsd-8
changeset: 318067:d32c0ee66815
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Apr 11 14:49:08 2018 +0000
description:
Pull up following revision(s) (requested by christos in ticket #738):

        sys/ufs/ffs/ffs_vfsops.c: revision 1.355

PR/52728: Izumi Tsutsui: "mount -u /dev/ /" triggers kernel panic

Simplify the control flow of the mount code and make sure that the
mountfrom argument can be converted to a block device in the update
case.

diffstat:

 sys/ufs/ffs/ffs_vfsops.c |  118 ++++++++++++++++++++++------------------------
 1 files changed, 56 insertions(+), 62 deletions(-)

diffs (168 lines):

diff -r 582dd52c01b4 -r d32c0ee66815 sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Wed Apr 11 14:45:51 2018 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Wed Apr 11 14:49:08 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_vfsops.c,v 1.353.4.1 2018/02/04 12:52:02 martin Exp $      */
+/*     $NetBSD: ffs_vfsops.c,v 1.353.4.2 2018/04/11 14:49:08 martin Exp $      */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.353.4.1 2018/02/04 12:52:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.353.4.2 2018/04/11 14:49:08 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -418,12 +418,13 @@
                return EINVAL;
        }
 
+       ump = VFSTOUFS(mp);
+       if ((mp->mnt_flag & (MNT_GETARGS|MNT_UPDATE)) && ump == NULL) {
+               DPRINTF("no ump");
+               return EIO;
+       }
+
        if (mp->mnt_flag & MNT_GETARGS) {
-               ump = VFSTOUFS(mp);
-               if (ump == NULL) {
-                       DPRINTF("no ump");
-                       return EIO;
-               }
                args->fspec = NULL;
                *data_len = sizeof *args;
                return 0;
@@ -432,7 +433,13 @@
        update = mp->mnt_flag & MNT_UPDATE;
 
        /* Check arguments */
-       if (args->fspec != NULL) {
+       if (args->fspec == NULL) {
+               if (!update) {
+                       /* New mounts must have a filename for the device */
+                       DPRINTF("no filename for mount");
+                       return EINVAL;
+               }
+       } else {
                /*
                 * Look up the name and verify that it's sane.
                 */
@@ -443,48 +450,43 @@
                        return error;
                }
 
-               if (!update) {
-                       /*
-                        * Be sure this is a valid block device
-                        */
-                       if (devvp->v_type != VBLK) {
-                               DPRINTF("non block device %d", devvp->v_type);
-                               error = ENOTBLK;
-                       } else if (bdevsw_lookup(devvp->v_rdev) == NULL) {
-                               DPRINTF("can't find block device 0x%jx",
-                                   devvp->v_rdev);
-                               error = ENXIO;
-                       }
-               } else {
+               /*
+                * Be sure this is a valid block device
+                */
+               if (devvp->v_type != VBLK) {
+                       DPRINTF("non block device %d", devvp->v_type);
+                       error = ENOTBLK;
+                       goto fail;
+               }
+
+               if (bdevsw_lookup(devvp->v_rdev) == NULL) {
+                       DPRINTF("can't find block device 0x%jx",
+                           devvp->v_rdev);
+                       error = ENXIO;
+                       goto fail;
+               }
+
+               if (update) {
                        /*
                         * Be sure we're still naming the same device
                         * used for our initial mount
                         */
-                       ump = VFSTOUFS(mp);
-                       if (devvp != ump->um_devvp) {
-                               if (devvp->v_rdev != ump->um_devvp->v_rdev) {
-                                       DPRINTF("wrong device 0x%jx != 0x%jx",
-                                           (uintmax_t)devvp->v_rdev,
-                                           (uintmax_t)ump->um_devvp->v_rdev);
-                                       error = EINVAL;
-                               } else {
-                                       vrele(devvp);
-                                       devvp = ump->um_devvp;
-                                       vref(devvp);
-                               }
+                       if (devvp != ump->um_devvp &&
+                           devvp->v_rdev != ump->um_devvp->v_rdev) {
+                               DPRINTF("wrong device 0x%jx != 0x%jx",
+                                   (uintmax_t)devvp->v_rdev,
+                                   (uintmax_t)ump->um_devvp->v_rdev);
+                               error = EINVAL;
+                               goto fail;
                        }
+                       vrele(devvp);
+                       devvp = NULL;
                }
-       } else {
-               if (!update) {
-                       /* New mounts must have a filename for the device */
-                       DPRINTF("no filename for mount");
-                       return EINVAL;
-               } else {
-                       /* Use the extant mount */
-                       ump = VFSTOUFS(mp);
-                       devvp = ump->um_devvp;
-                       vref(devvp);
-               }
+       }
+
+       if (devvp == NULL) {
+               devvp = ump->um_devvp;
+               vref(devvp);
        }
 
        /*
@@ -495,25 +497,17 @@
         * updating the mount is okay (for example, as far as securelevel goes)
         * which leaves us with the normal check.
         */
-       if (error == 0) {
-               accessmode = VREAD;
-               if (update ?
-                   (mp->mnt_iflag & IMNT_WANTRDWR) != 0 :
-                   (mp->mnt_flag & MNT_RDONLY) == 0)
-                       accessmode |= VWRITE;
-               vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
-               error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_MOUNT,
-                   KAUTH_REQ_SYSTEM_MOUNT_DEVICE, mp, devvp,
-                   KAUTH_ARG(accessmode));
-               if (error) {
-                       DPRINTF("kauth returned %d", error);
-               }
-               VOP_UNLOCK(devvp);
-       }
-
+       accessmode = VREAD;
+       if (update ? (mp->mnt_iflag & IMNT_WANTRDWR) != 0 :
+           (mp->mnt_flag & MNT_RDONLY) == 0)
+               accessmode |= VWRITE;
+       vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
+       error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_MOUNT,
+           KAUTH_REQ_SYSTEM_MOUNT_DEVICE, mp, devvp, KAUTH_ARG(accessmode));
+       VOP_UNLOCK(devvp);
        if (error) {
-               vrele(devvp);
-               return (error);
+               DPRINTF("kauth returned %d", error);
+               goto fail;
        }
 
 #ifdef WAPBL