diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2017-09-06 16:34:42 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2017-09-06 16:34:42 +0000 |
| commit | 6f47d67bfefaeb4117a6acd1c6d9dd00281280dc (patch) | |
| tree | abf4b9a616f41c26d959fb3e65f26da7790f12ee /bin | |
| parent | 2c73c414eb0b7cb81e3142d98733f3be429f2abf (diff) | |
| download | src-6f47d67bfefaeb4117a6acd1c6d9dd00281280dc.tar.gz src-6f47d67bfefaeb4117a6acd1c6d9dd00281280dc.zip | |
Make ps(1) flag processes in capsicum(4) capability mode with "C".
Obtained from: CheriBSD
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Notes
Notes:
svn path=/head/; revision=323228
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ps/print.c | 2 | ||||
| -rw-r--r-- | bin/ps/ps.1 | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bin/ps/print.c b/bin/ps/print.c index 3c8214a3bb37..cb63369a3992 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -274,6 +274,8 @@ state(KINFO *k, VARENT *ve __unused) *cp++ = 'V'; if ((flag & P_SYSTEM) || k->ki_p->ki_lock > 0) *cp++ = 'L'; + if ((k->ki_p->ki_cr_flags & CRED_FLAG_CAPMODE) != 0) + *cp++ = 'C'; if (k->ki_p->ki_kiflag & KI_SLEADER) *cp++ = 's'; if ((flag & P_CONTROLT) && k->ki_p->ki_pgid == k->ki_p->ki_tpgid) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index b5270cfcdecc..cf6a8528d13c 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd July 25, 2017 +.Dd September 6, 2017 .Dt PS 1 .Os .Sh NAME @@ -436,6 +436,10 @@ information: The process is in the foreground process group of its control terminal. .It Li < The process has raised CPU scheduling priority. +.It Li C +The process is in +.Xr capsicum 4 +capability mode. .It Li E The process is trying to exit. .It Li J |