Mon Dec 19 03:02:31 2011 UTC ()

don't produce different output if we are super user.


(christos)

diff -r1.63 -r1.64 src/sys/miscfs/procfs/procfs_linux.c

--- src/sys/miscfs/procfs/procfs_linux.c 2011/12/16 20:45:07	1.63
+++ src/sys/miscfs/procfs/procfs_linux.c 2011/12/19 03:02:31	1.64

 @@ -1,14 +1,14 @@
-/*      $NetBSD: procfs_linux.c,v 1.63 2011/12/16 20:45:07 christos Exp $      */
+/*      $NetBSD: procfs_linux.c,v 1.64 2011/12/19 03:02:31 christos Exp $      */
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,27 +26,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.63 2011/12/16 20:45:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.64 2011/12/19 03:02:31 christos Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/tty.h>
 @@ -583,45 +583,42 @@ procfs_format_sfs(char **mtab, size_t *m
 	*mtab = realloc(*mtab, *mlen + blen, M_TEMP, M_WAITOK);
 	memcpy(*mtab + *mlen, buf, blen);
 	*mlen += blen;
 	return sfs->f_mntonname[0] == '/' && sfs->f_mntonname[1] == '\0';
+}
 int
 procfs_domounts(struct lwp *curl, struct proc *p,
     struct pfsnode *pfs, struct uio *uio)
+{
 	char *bf, *mtab = NULL;
 	size_t mtabsz = 0;
 	struct mount *mp, *nmp;
-	int error = 0, suser, root = 0;
+	int error = 0, root = 0;
 	struct cwdinfo *cwdi = curl->l_proc->p_cwdi;
 	suser = kauth_authorize_generic(curl->l_cred,
 	    KAUTH_GENERIC_ISSUSER, NULL) == 0;
 	bf = malloc(LBFSZ, M_TEMP, M_WAITOK);
 	mutex_enter(&mountlist_lock);
 	for (mp = CIRCLEQ_FIRST(&mountlist); mp != (void *)&mountlist;
 	    mp = nmp) {
 		struct statvfs sfs;
 		if (vfs_busy(mp, &nmp))
 			continue;
-		if ((error = dostatvfs(mp, &sfs, curl, MNT_WAIT, suser)) == 0)
+		if ((error = dostatvfs(mp, &sfs, curl, MNT_WAIT, 0)) == 0)
 			root |= procfs_format_sfs(&mtab, &mtabsz, bf, LBFSZ,
-			    &sfs, curl, suser);
+			    &sfs, curl, 0);
 		vfs_unbusy(mp, false, &nmp);
+	}
 	mutex_exit(&mountlist_lock);
 	/*
 	 * If we are inside a chroot that is not itself a mount point,
 	 * fake a root entry.
 	 */
 	if (!root && cwdi->cwdi_rdir)
 		(void)procfs_format_sfs(&mtab, &mtabsz, bf, LBFSZ,
 		    &cwdi->cwdi_rdir->v_mount->mnt_stat, curl, 1);