svn commit: r323228 - head/bin/ps

[Edward Tomasz Napierala]

Author: trasz
Date: Wed Sep  6 16:34:42 2017
New Revision: 323228
URL: https://svnweb.freebsd.org/changeset/base/323228

Log:
  Make ps(1) flag processes in capsicum(4) capability mode with "C".
  
  Obtained from:	CheriBSD
  MFC after:	2 weeks
  Sponsored by:	DARPA, AFRL

Modified:
  head/bin/ps/print.c
  head/bin/ps/ps.1

Modified: head/bin/ps/print.c
==============================================================================
--- head/bin/ps/print.c	Wed Sep  6 16:24:34 2017	(r323227)
+++ head/bin/ps/print.c	Wed Sep  6 16:34:42 2017	(r323228)
@@ -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)

Modified: head/bin/ps/ps.1
==============================================================================
--- head/bin/ps/ps.1	Wed Sep  6 16:24:34 2017	(r323227)
+++ head/bin/ps/ps.1	Wed Sep  6 16:34:42 2017	(r323228)
@@ -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