 @@ -1,14 +1,14 @@
-/* $NetBSD: vmstat.c,v 1.245 2021/04/01 06:23:14 simonb Exp $ */
+/* $NetBSD: vmstat.c,v 1.246 2021/04/02 06:28:55 simonb Exp $ */
 /*-
  * Copyright (c) 1998, 2000, 2001, 2007, 2019, 2020
  *     The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation by:
  *	- Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  *	  NASA Ames Research Center.
  *	- Simon Burge and Luke Mewburn of Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -61,27 +61,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1986, 1991, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 3/1/95";
 #else
-__RCSID("$NetBSD: vmstat.c,v 1.245 2021/04/01 06:23:14 simonb Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.246 2021/04/02 06:28:55 simonb Exp $");
 #endif
 #endif /* not lint */
 #define	__POOL_EXPOSE
 #define __NAMECACHE_PRIVATE
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/uio.h>
 #include <sys/buf.h>
 #include <sys/evcnt.h>
 @@ -318,39 +318,37 @@ void	hist_dodump_sysctl(int[], unsigned
 char	**choosedrives(char **);
 /* Namelist and memory file names. */
 char	*nlistf, *memf;
 /* allow old usage [vmstat 1] */
 #define	BACKWARD_COMPATIBILITY
 static const int clockrate_mib[] = { CTL_KERN, KERN_CLOCKRATE };
 static const int vmmeter_mib[] = { CTL_VM, VM_METER };
 static const int uvmexp2_mib[] = { CTL_VM, VM_UVMEXP2 };
 static const int boottime_mib[] = { CTL_KERN, KERN_BOOTTIME };
 static char kvm_errbuf[_POSIX2_LINE_MAX];
 int
 main(int argc, char *argv[])
+{
 	int c, todo, verbose, wide;
 	struct timespec interval;
 	int reps;
 	gid_t egid = getegid();
 	const char *histname, *hashname;
 	char errbuf[_POSIX2_LINE_MAX];
 	histname = hashname = NULL;
 	(void)setegid(getgid());
 	memf = nlistf = NULL;
 	reps = todo = verbose = wide = 0;
 	interval.tv_sec = 0;
 	interval.tv_nsec = 0;
 	while ((c = getopt(argc, argv, "Cc:efh:HilLM:mN:stu:UvWw:")) != -1) {
 		switch (c) {
 		case 'c':
 			reps = atoi(optarg);
 			break;
 		case 'C':
 			todo |= POOLCACHESTAT;
 			break;
 		case 'e':
 @@ -405,79 +403,63 @@ main(int argc, char *argv[])
 			interval.tv_sec = atol(optarg);
 			break;
 		case '?':
 		default:
 			usage();
+		}
+	}
 	argc -= optind;
 	argv += optind;
 	if (todo == 0)
 		todo = VMSTAT;
-	/*
+	if (memf == NULL) {
-	 * Discard setgid privileges.  If not the running kernel, we toss
+		kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf);
-	 * them away totally so that bad guys can't print interesting stuff
+	} else {
-	 * from kernel memory, otherwise switch back to kmem for the
+		kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf);
-	 * duration of the kvm_openfiles() call.
+		getnlist(todo);
 	 */
 	if (nlistf != NULL || memf != NULL)
 		(void)setgid(getgid());
 	else
 		(void)setegid(egid);
 	kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, kvm_errbuf);
 	if (kd == NULL) {
 		if (nlistf != NULL || memf != NULL) {
 			errx(1, "kvm_openfiles: %s", kvm_errbuf);
+	}
-	if (nlistf == NULL && memf == NULL)
+	if (kd == NULL)
-		(void)setgid(getgid());
+		errx(EXIT_FAILURE, "%s", errbuf);
 	if (todo & VMSTAT) {
 		struct winsize winsize;
 		(void)drvinit(0);/* Initialize disk stats, no disks selected. */
 		(void)setgid(getgid()); /* don't need privs anymore */
 		argv = choosedrives(argv);	/* Select disks. */
 		winsize.ws_row = 0;
 		(void)ioctl(STDOUT_FILENO, TIOCGWINSZ, &winsize);
 		if (winsize.ws_row > 0)
 			winlines = winsize.ws_row;
+	}
 #ifdef	BACKWARD_COMPATIBILITY
 	if (*argv) {
 		interval.tv_sec = atol(*argv);
 		if (*++argv)
 			reps = atoi(*argv);
+	}
 #endif
 	if (interval.tv_sec) {
 		if (!reps)
 			reps = -1;
 	} else if (reps)
 		interval.tv_sec = 1;
 	getnlist(todo);
 	/*
 	 * Statistics dumping is incompatible with the default
 	 * VMSTAT/dovmstat() output. So perform the interval/reps handling
 	 * for it here.
 	 */
 	if ((todo & (VMSTAT|VMTOTAL)) == 0) {
 		for (;;) {
 			if (todo & (HISTLIST|HISTDUMP)) {
 				if ((todo & (HISTLIST|HISTDUMP)) ==
 				    (HISTLIST|HISTDUMP))
 					errx(1, "you may list or dump,"
 					    " but not both!");
 				if (memf != NULL)
 @@ -529,56 +511,50 @@ main(int argc, char *argv[])
 			errx(1, "you may not both do vmstat and vmtotal");
+		}
 		if (todo & VMSTAT)
 			dovmstat(&interval, reps);
 		if (todo & VMTOTAL)
 			dovmtotal(&interval, reps);
+	}
 	return 0;
+}
 void
 getnlist(int todo)
+{
 	static int namelist_done = 0;
 	static int done = 0;
 	int c;
 	size_t i;
-	if (kd == NULL)
+	if ((c = kvm_nlist(kd, namelist)) != 0) {
-		errx(1, "kvm_openfiles: %s", kvm_errbuf);
+		int doexit = 0;
 		if (c == -1)
-	if (!namelist_done) {
+			errx(1, "kvm_nlist: %s %s",
-		namelist_done = 1;
+			    "namelist", kvm_geterr(kd));
-		if ((c = kvm_nlist(kd, namelist)) != 0) {
+		for (i = 0; i < __arraycount(namelist)-1; i++)
-			int doexit = 0;
+			if (namelist[i].n_type == 0) {
-			if (c == -1)
+				if (doexit++ == 0)
-				errx(1, "kvm_nlist: %s %s",
+					(void)fprintf(stderr,
-				    "namelist", kvm_geterr(kd));
+					    "%s: undefined symbols:",
-			for (i = 0; i < __arraycount(namelist)-1; i++)
+					    getprogname());
-				if (namelist[i].n_type == 0) {
+				(void)fprintf(stderr, " %s",
-					if (doexit++ == 0)
+				    namelist[i].n_name);
 						(void)fprintf(stderr,
 						    "%s: undefined symbols:",
 						    getprogname());
 					(void)fprintf(stderr, " %s",
 					    namelist[i].n_name);
 			if (doexit) {
 				(void)fputc('\n', stderr);
 				exit(1);
+			}
 		if (doexit) {
 			(void)fputc('\n', stderr);
 			exit(1);
+		}
+	}
 	if ((todo & (VMSTAT|INTRSTAT)) && !(done & (VMSTAT))) {
 		done |= VMSTAT;
 		if ((c = kvm_nlist(kd, timenl)) == -1 || c == X_TIMENL_SIZE)
 			errx(1, "kvm_nlist: %s %s", "timenl", kvm_geterr(kd));
+	}
 	if ((todo & (SUMSTAT|INTRSTAT)) && !(done & (SUMSTAT|INTRSTAT))) {
 		done |= SUMSTAT|INTRSTAT;
 		(void) kvm_nlist(kd, intrnl);
+	}
 	if ((todo & (HASHLIST|HASHSTAT)) && !(done & (HASHLIST|HASHSTAT))) {
 		done |= HASHLIST|HASHSTAT;
 		if ((c = kvm_nlist(kd, hashnl)) == -1 || c == X_HASHNL_SIZE)
 			errx(1, "kvm_nlist: %s %s", "hashnl", kvm_geterr(kd));

 @@ -1,24 +1,19 @@
-#	$NetBSD: Makefile,v 1.34 2016/12/29 23:42:39 mrg Exp $
+#	$NetBSD: Makefile,v 1.35 2021/04/02 06:28:55 simonb Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 .include <bsd.own.mk>
 USE_FORT?= yes	# setgid
 PROG=	vmstat
 CPPFLAGS+=-D_KMEMUSER -I${NETBSDSRCDIR}/sys
 SRCS=	drvstats.c vmstat.c
 MAN=	vmstat.1
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 BINGRP=	kmem
 BINMODE=2555
 CWARNFLAGS.clang+=	-Wno-format-extra-args
 COPTS.vmstat.c += -Wno-format-nonliteral
 # sparc64 is broken!
 COPTS.vmstat.c += -Wno-error=stack-protector
 .include "../../compat/exec.mk"
 .include <bsd.prog.mk>