diff options
| author |   bluhm <bluhm@openbsd.org> | 2013-11-25 12:48:39 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2013-11-25 12:48:39 +0000 |
| commit | 975c9b36b399046cc163dc8bd9c07327a098ffd6 (patch) | |
| tree | b69e6993222280e2aa21579e7572df17293fd18c | |
| parent | Use iswupper() for wide characters, not isupper(); ok deraadt (diff) | |
| download | wireguard-openbsd-975c9b36b399046cc163dc8bd9c07327a098ffd6.tar.xz wireguard-openbsd-975c9b36b399046cc163dc8bd9c07327a098ffd6.zip | |
netstat -Ar leaked some kernel pointers to unprivileged users. Use
hideroot to show them only to root.
OK deraadt@
| -rw-r--r-- | usr.bin/netstat/route.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index eefb9b301bb..0f63d85d482 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.92 2013/11/21 17:32:13 mikeb Exp $ */ +/* $OpenBSD: route.c,v 1.93 2013/11/25 12:48:39 bluhm Exp $ */ /* $NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $ */ /* @@ -171,7 +171,7 @@ again: kread((u_long)rn, &rnode, sizeof(rnode)); if (rnode.rn_b < 0) { if (Aflag) - printf("%-16p ", rn); + printf("%-16p ", hideroot ? 0 : rn); if (rnode.rn_flags & RNF_ROOT) { if (Aflag) printf("(root node)%s", @@ -190,7 +190,7 @@ again: goto again; } else { if (Aflag && do_rtent) { - printf("%-16p ", rn); + printf("%-16p ", hideroot ? 0 : rn); p_rtnode(); } rn = rnode.rn_r; @@ -237,8 +237,9 @@ p_rtnode(void) } else { snprintf(nbuf, sizeof nbuf, "(%d)", rnode.rn_b); printf("%6.6s (%p) %16p : %16p", nbuf, - hideroot ? 0 : rnode.rn_p, rnode.rn_l, - rnode.rn_r); + hideroot ? 0 : rnode.rn_p, + hideroot ? 0 : rnode.rn_l, + hideroot ? 0 : rnode.rn_r); } putchar(' '); |