[src/netbsd-3]: src/sys/kern Pull up revision 1.218 (requested by yamt in tic...

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

details:   https://anonhg.NetBSD.org/src/rev/9262ce586214
branches:  netbsd-3
changeset: 575360:9262ce586214
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 13 21:31:09 2005 +0000

description:
Pull up revision 1.218 (requested by yamt in ticket #142):
sys_mount:
- reject attempts of MNT_GETARGS + other MNT_xxx.
- don't modify mnt_flags needlessly for MNT_GETARGS.
  a stopgap fix for PR/29898.

diffstat:

 sys/kern/vfs_syscalls.c |  49 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 30 insertions(+), 19 deletions(-)

diffs (84 lines):

diff -r 24ff734aea87 -r 9262ce586214 sys/kern/vfs_syscalls.c
--- a/sys/kern/vfs_syscalls.c   Wed Apr 13 16:42:09 2005 +0000
+++ b/sys/kern/vfs_syscalls.c   Wed Apr 13 21:31:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_syscalls.c,v 1.217 2005/02/26 21:34:56 perry Exp $ */
+/*     $NetBSD: vfs_syscalls.c,v 1.217.2.1 2005/04/13 21:31:09 tron Exp $      */
 
 /*
  * Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.217 2005/02/26 21:34:56 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.217.2.1 2005/04/13 21:31:09 tron Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_43.h"
@@ -140,6 +140,15 @@
        struct nameidata nd;
        struct vfsops *vfs;
 
+       /*
+        * if MNT_GETARGS is specified, it should be only flag.
+        */
+
+       if ((SCARG(uap, flags) & MNT_GETARGS) != 0 &&
+           (SCARG(uap, flags) & ~MNT_GETARGS) != 0) {
+               return EINVAL;
+       }
+
        if (dovfsusermount == 0 && (SCARG(uap, flags) & MNT_GETARGS) == 0 &&
            (error = suser(p->p_ucred, &p->p_acflag)))
                return (error);
@@ -312,22 +321,24 @@
         */
        mp->mnt_flag |= SCARG(uap, flags) & MNT_FORCE;
  update:
-       /*
-        * Set the mount level flags.
-        */
-       if (SCARG(uap, flags) & MNT_RDONLY)
-               mp->mnt_flag |= MNT_RDONLY;
-       else if (mp->mnt_flag & MNT_RDONLY)
-               mp->mnt_iflag |= IMNT_WANTRDWR;
-       mp->mnt_flag &=
-         ~(MNT_NOSUID | MNT_NOEXEC | MNT_NODEV |
-           MNT_SYNCHRONOUS | MNT_UNION | MNT_ASYNC | MNT_NOCOREDUMP |
-           MNT_NOATIME | MNT_NODEVMTIME | MNT_SYMPERM | MNT_SOFTDEP);
-       mp->mnt_flag |= SCARG(uap, flags) &
-          (MNT_NOSUID | MNT_NOEXEC | MNT_NODEV |
-           MNT_SYNCHRONOUS | MNT_UNION | MNT_ASYNC | MNT_NOCOREDUMP |
-           MNT_NOATIME | MNT_NODEVMTIME | MNT_SYMPERM | MNT_SOFTDEP |
-           MNT_IGNORE);
+       if ((SCARG(uap, flags) & MNT_GETARGS) == 0) {
+               /*
+                * Set the mount level flags.
+                */
+               if (SCARG(uap, flags) & MNT_RDONLY)
+                       mp->mnt_flag |= MNT_RDONLY;
+               else if (mp->mnt_flag & MNT_RDONLY)
+                       mp->mnt_iflag |= IMNT_WANTRDWR;
+               mp->mnt_flag &=
+                 ~(MNT_NOSUID | MNT_NOEXEC | MNT_NODEV |
+                   MNT_SYNCHRONOUS | MNT_UNION | MNT_ASYNC | MNT_NOCOREDUMP |
+                   MNT_NOATIME | MNT_NODEVMTIME | MNT_SYMPERM | MNT_SOFTDEP);
+               mp->mnt_flag |= SCARG(uap, flags) &
+                  (MNT_NOSUID | MNT_NOEXEC | MNT_NODEV |
+                   MNT_SYNCHRONOUS | MNT_UNION | MNT_ASYNC | MNT_NOCOREDUMP |
+                   MNT_NOATIME | MNT_NODEVMTIME | MNT_SYMPERM | MNT_SOFTDEP |
+                   MNT_IGNORE);
+       }
        /*
         * Mount the filesystem.
         */
@@ -335,7 +346,7 @@
        if (mp->mnt_flag & (MNT_UPDATE | MNT_GETARGS)) {
                if (mp->mnt_iflag & IMNT_WANTRDWR)
                        mp->mnt_flag &= ~MNT_RDONLY;
-               if (error || (mp->mnt_flag & MNT_GETARGS))
+               if (error)
                        mp->mnt_flag = flag;
                mp->mnt_flag &=~
                    (MNT_RELOAD | MNT_FORCE | MNT_UPDATE | MNT_GETARGS);