revoke privs before opening kvm if user has specified mem/kernel paths

2 files changed, 13 insertions, 0 deletions

diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index 38855e85e60..081eb086cd4 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -181,6 +181,12 @@ main(argc, argv)
 		default:
 			usage();
 		}
+	/*
+	 * Discard setgid privileges if not the running kernel so that bad
+	 * guys can't print interesting stuff from kernel memory.
+	 */
+	if (namelist != NULL || core != NULL)
+		setgid(getgid());
 	if ((kd = kvm_open(namelist, core, NULL, O_RDONLY, "ipcs")) == NULL)
 		exit(1);
 
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 1eee27dde0b..f7deb59f1f7 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -166,6 +166,13 @@ main(argc, argv)
 	argc -= optind;
 	argv += optind;
 
+	/*
+	 * 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)
+		setgid(getgid());
+
 	if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf)) == NULL)
 		errx(1, "%s", errbuf);