Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/bin/ps Added experimental fallback /proc-based lookup. Warn...
details: https://anonhg.NetBSD.org/src/rev/5e2a4c4faa0e
branches: trunk
changeset: 467645:5e2a4c4faa0e
user: bgrayson <bgrayson%NetBSD.org@localhost>
date: Fri Mar 26 22:36:02 1999 +0000
description:
Added experimental fallback /proc-based lookup. Warnings are printed when the
fallback method is used, as the results could be untrustworthy if an
intruder is present. It is highly likely that NetBSD-1.5 will have
an improved kvm interface for reading process information, at which
point this code can be garbage-collected. Also added a word to the
man page -x option description while I was here.
diffstat:
bin/ps/Makefile | 4 +-
bin/ps/extern.h | 3 +-
bin/ps/procfs_ops.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++++
bin/ps/ps.1 | 27 +++++-
bin/ps/ps.c | 44 +++++++++-
5 files changed, 306 insertions(+), 8 deletions(-)
diffs (truncated from 393 to 300 lines):
diff -r edbf93918d10 -r 5e2a4c4faa0e bin/ps/Makefile
--- a/bin/ps/Makefile Fri Mar 26 22:32:03 1999 +0000
+++ b/bin/ps/Makefile Fri Mar 26 22:36:02 1999 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 1999/03/24 05:50:49 mrg Exp $
+# $NetBSD: Makefile,v 1.25 1999/03/26 22:36:02 bgrayson Exp $
# @(#)Makefile 8.1 (Berkeley) 6/2/93
PROG= ps
-SRCS= fmt.c keyword.c nlist.c print.c ps.c
+SRCS= fmt.c keyword.c nlist.c print.c ps.c procfs_ops.c
DPADD= ${LIBM} ${LIBKVM}
LDADD= -lm -lkvm
BINGRP= kmem
diff -r edbf93918d10 -r 5e2a4c4faa0e bin/ps/extern.h
--- a/bin/ps/extern.h Fri Mar 26 22:32:03 1999 +0000
+++ b/bin/ps/extern.h Fri Mar 26 22:36:02 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.12 1998/02/06 04:47:30 mrg Exp $ */
+/* $NetBSD: extern.h,v 1.13 1999/03/26 22:36:02 bgrayson Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -68,6 +68,7 @@
void pnice __P((KINFO *, VARENT *));
void pri __P((KINFO *, VARENT *));
void printheader __P((void));
+struct kinfo_proc * procfs_getprocs __P((int, int, int*));
void pvar __P((KINFO *, VARENT *));
void rssize __P((KINFO *, VARENT *));
void runame __P((KINFO *, VARENT *));
diff -r edbf93918d10 -r 5e2a4c4faa0e bin/ps/procfs_ops.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/ps/procfs_ops.c Fri Mar 26 22:36:02 1999 +0000
@@ -0,0 +1,236 @@
+/* $NetBSD: procfs_ops.c,v 1.1 1999/03/26 22:36:02 bgrayson Exp $ */
+
+/*
+ * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Brian Grayson (bgrayson%netbsd.org@localhost).
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND 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 THE FOUNDATION OR CONTRIBUTORS
+ * 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>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <fcntl.h>
+#include <dirent.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <err.h>
+#include <kvm.h>
+
+/* Assume that no process status file will ever be larger than this. */
+#define STATUS_SIZE 8192
+
+/* Handy macro for only printing a warning once. Notice that
+ * one needs to use two sets of parentheses when invoking the
+ * macro: WARNX_ONLY_ONCE(("mesgstr", arg1, arg2, ...)); */
+#define WARNX_ONLY_ONCE(x) { \
+ static int firsttime=1; \
+ if (firsttime) { \
+ firsttime=0; \
+ warnx x ; \
+ } \
+}
+
+static int
+parsekinfo(const char *, struct kinfo_proc *);
+
+static int
+parsekinfo (path, kp)
+ const char *path;
+ struct kinfo_proc *kp;
+{
+ char fullpath[MAXPATHLEN];
+ int fd, nbytes, devmajor, devminor;
+ struct timeval usertime, systime, starttime;
+ char buff[STATUS_SIZE];
+ char flagstr[256];
+
+ /* Open /proc/"path"/status, and parse it into the kinfo_proc. */
+ snprintf(fullpath, MAXPATHLEN, "/proc/%s/status", path);
+ fd=open(fullpath, O_RDONLY, 0);
+ if (fd == -1) {
+ /* Don't print warning, as the process may have
+ * died since our scan of the directory entries. */
+ /*warn("Open failed for %s", fullpath);*/
+ return -1; /* Process may no longer exist. */
+ }
+ nbytes=read(fd, buff, STATUS_SIZE);
+ close(fd);
+ if (nbytes <= 0) {
+ /* Don't print warning, as the process may have
+ * died since our scan of the directory entries. */
+ /*warn("Read failed for %s", fullpath);*/
+ return -1; /* Process may no longer exist. */
+ }
+ /* Terminate the buffer. */
+ buff[nbytes] = '\0';
+ sscanf(buff, "%s %d %d %d %d %d,%d %s %ld,%ld %ld,%ld %ld,%ld %s %d",
+ kp->kp_proc.p_comm, &kp->kp_proc.p_pid,
+ &kp->kp_eproc.e_ppid, &kp->kp_eproc.e_pgid,
+ &kp->kp_eproc.e_sid, &devmajor, &devminor,
+ flagstr, &starttime.tv_sec, &starttime.tv_usec,
+ &usertime.tv_sec, &usertime.tv_usec,
+ &systime.tv_sec, &systime.tv_usec,
+ kp->kp_eproc.e_wmesg, &kp->kp_eproc.e_ucred.cr_uid);
+ kp->kp_proc.p_wmesg = kp->kp_eproc.e_wmesg;
+ kp->kp_proc.p_wchan = (void*)1; /* Set it to _something_. */
+ kp->kp_eproc.e_tdev = makedev(devmajor, devminor);
+ /* Put both user and sys time into rtime field. */
+ kp->kp_proc.p_rtime.tv_sec = usertime.tv_sec + systime.tv_sec;
+ kp->kp_proc.p_rtime.tv_usec = usertime.tv_usec + systime.tv_usec;
+ /* CPU time isn't shown unless the ki_u.u_valid flag is
+ * set. Unfortunately, we don't have access to that here. */
+ /* Set the flag for whether or not there is
+ * a controlling terminal. */
+ if (strstr(flagstr, "ctty"))
+ kp->kp_proc.p_flag |= P_CONTROLT;
+ return 0;
+}
+
+struct kinfo_proc *
+procfs_getprocs(op, arg, cnt)
+ int op, arg;
+ int *cnt;
+{
+ struct stat statbuf;
+ int procdirfd, nbytes, knum=0, maxknum=0;
+ char *direntbuff;
+ struct kinfo_proc *kp;
+ int mib[4];
+ size_t len;
+
+ /* First, try to stat /proc/1/status. If we can't do
+ * that, then just return right away. */
+ if (stat("/proc/1/status", &statbuf)) {
+ warn("stat of /proc/1/status");
+ return 0;
+ }
+ /* Now, try to open /proc, and read in all process' information. */
+ procdirfd = open("/proc", O_RDONLY, 0);
+ if (procdirfd == -1) {
+ warn("open of /proc directory");
+ return 0;
+ }
+
+ direntbuff = malloc(statbuf.st_blksize);
+ if (direntbuff == NULL) {
+ warn("malloc() of %d bytes", statbuf.st_blksize);
+ return 0;
+ }
+ /* Use sysctl to find out the total number of processes.
+ * There's still a race condition -- once we do the
+ * sysctl, someone could use a sysctl to bump it, and
+ * fork off a lot of processes. So, to be _really_
+ * safe, let's allocate twice as much memory. */
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_MAXPROC;
+ len = sizeof(maxknum);
+ if (sysctl(mib, 2, &maxknum, &len, NULL, 0) == -1) {
+ err(1,"sysctl to fetch maxproc");
+ }
+ maxknum *= 2; /* Double it, to be really paranoid. */
+
+ kp = (struct kinfo_proc *) malloc(sizeof(struct kinfo_proc)*maxknum);
+ memset(kp, 0, sizeof(struct kinfo_proc)*maxknum);
+
+ /* Read in a batch of entries at a time. */
+ while ((knum < maxknum) &&
+ (nbytes = getdents(procdirfd, direntbuff,
+ statbuf.st_blksize)) != 0) {
+ int i;
+ struct dirent *dp;
+ for (i=0; i<nbytes; /* nothing */) {
+ dp = (struct dirent *) &direntbuff[i];
+ i += dp->d_reclen;
+ if (!strcmp(dp->d_name, ".")) continue;
+ if (!strcmp(dp->d_name, "..")) continue;
+ if (!strcmp(dp->d_name, "curproc")) continue;
+ if (parsekinfo(dp->d_name, &kp[knum]) != 0) continue;
+ /* Now check some of the flags. If the
+ * newest entry doesn't match the flag
+ * settings, then don't bump the pointer
+ * past it! */
+ switch (op) {
+ case KERN_PROC_PID:
+ if (kp[knum].kp_proc.p_pid == arg)
+ knum++;
+ break;
+ case KERN_PROC_PGRP:
+ if (kp[knum].kp_eproc.e_pgid == arg)
+ knum++;
+ break;
+ case KERN_PROC_SESSION:
+ if (kp[knum].kp_eproc.e_sid == arg)
+ knum++;
+ break;
+ case KERN_PROC_TTY:
+ if (kp[knum].kp_eproc.e_tdev == arg)
+ knum++;
+ break;
+ case KERN_PROC_UID:
+ if (kp[knum].kp_eproc.e_ucred.cr_uid == arg)
+ knum++;
+ break;
+ case KERN_PROC_RUID:
+ WARNX_ONLY_ONCE(("KERN_PROC_RUID flag "
+ "not implemented. Returning "
+ "info for all processes."));
+ knum++;
+ break;
+ case KERN_PROC_ALL:
+ knum++;
+ break;
+ default:
+ WARNX_ONLY_ONCE(("Bad switch case! "
+ "Returning info for "
+ "all processes."));
+ knum++;
+ break;
+ }
+ if (knum > maxknum) {
+ WARNX_ONLY_ONCE(("Warning: only reporting "
+ "information for first %d "
+ "processes!", maxknum));
+ break;
+ }
+
+ }
+ }
+
+ *cnt = knum;
+ return kp;
+}
diff -r edbf93918d10 -r 5e2a4c4faa0e bin/ps/ps.1
--- a/bin/ps/ps.1 Fri Mar 26 22:32:03 1999 +0000
+++ b/bin/ps/ps.1 Fri Mar 26 22:36:02 1999 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: ps.1,v 1.29 1999/03/22 18:30:45 garbled Exp $
+.\" $NetBSD: ps.1,v 1.30 1999/03/26 22:36:02 bgrayson Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -183,9 +183,29 @@
.Nm
will use as many columns as necessary without regard for your window size.
.It Fl x
-Display information about processes without controlling terminals.
+Also display information about processes without controlling terminals.
.El
.Pp
+If
+.Nm
+is unable to extract process information directly from the
+kernel (e.g., due to incorrect
+.Fl M
+or
+.Fl N
+options or kvm-based reasons), it currently uses an experimental
+fallback method to gather as much information as possible through the
+limited
+.Dq Pa /proc
+interface, if the
Home |
Main Index |
Thread Index |
Old Index