diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2005-05-03 03:41:12 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2005-05-03 03:41:12 +0000 |
| commit | 5c95f5e2f59798905d4a5b67439d42ae084252e1 (patch) | |
| tree | 25eaa465c5ea04d1c9908ea6d801304b16d2d948 /usr.sbin/pstat/pstat.c | |
| parent | 9160bd40bfe1cf2a8155e00c62a9eeed136cfd91 (diff) | |
setresgid; ok deraadt@
Diffstat (limited to 'usr.sbin/pstat/pstat.c')
| -rw-r--r-- | usr.sbin/pstat/pstat.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index 6bb445caac7..b9d649b202e 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pstat.c,v 1.49 2005/02/08 14:48:08 pat Exp $ */ +/* $OpenBSD: pstat.c,v 1.50 2005/05/03 03:41:11 djm Exp $ */ /* $NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $ */ /*- @@ -40,7 +40,7 @@ static char copyright[] = #if 0 from: static char sccsid[] = "@(#)pstat.c 8.9 (Berkeley) 2/16/94"; #else -static char *rcsid = "$OpenBSD: pstat.c,v 1.49 2005/02/08 14:48:08 pat Exp $"; +static char *rcsid = "$OpenBSD: pstat.c,v 1.50 2005/05/03 03:41:11 djm Exp $"; #endif #endif /* not lint */ @@ -147,6 +147,7 @@ main(int argc, char *argv[]) int ch; extern char *optarg; extern int optind; + gid_t gid; while ((ch = getopt(argc, argv, "TM:N:fiknstv")) != -1) switch (ch) { @@ -188,17 +189,18 @@ main(int argc, char *argv[]) * Discard setgid privileges if not the running kernel so that bad * guys can't print interesting stuff from kernel memory. */ - if (nlistf != NULL || memf != NULL) { - (void)setegid(getgid()); - (void)setgid(getgid()); - } + gid = getgid(); + if (nlistf != NULL || memf != NULL) + if (setresgid(gid, gid, gid) == -1) + err(1, "setresgid"); if (vnodeflag) if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, buf)) == 0) errx(1, "kvm_openfiles: %s", buf); - (void)setegid(getgid()); - (void)setgid(getgid()); + if (nlistf == NULL && memf == NULL) + if (setresgid(gid, gid, gid) == -1) + err(1, "setresgid"); if (vnodeflag) if (kvm_nlist(kd, nl) == -1) |