diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-06-23 16:57:03 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-06-23 16:57:03 +0000 |
| commit | 01717f12bea0c139f1a7a58d8872f4c38a0fb1f5 (patch) | |
| tree | 4d5c4166fa1f0e2394f12adcd518fa140cfcebcf /sys | |
| parent | 20acdc22fdea4f3a45f9cf7360045ffa395e27e3 (diff) | |
Export unveil state so that ps(8) can show it. Two new status flags,
you'll see one, or neither.
'u' - process installed unveils, but not yet locked with unveil(0,0)
or pledge w/o "unveil"
'U' - process has installed unveils, and locked.
ok rob
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/sys/sysctl.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index bb8c521f38e..566b422e637 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.h,v 1.189 2019/06/21 09:39:48 visa Exp $ */ +/* $OpenBSD: sysctl.h,v 1.190 2019/06/23 16:57:00 deraadt Exp $ */ /* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */ /* @@ -363,6 +363,8 @@ struct kinfo_proc { int32_t p_eflag; /* LONG: extra kinfo_proc flags */ #define EPROC_CTTY 0x01 /* controlling tty vnode active */ #define EPROC_SLEADER 0x02 /* session leader */ +#define EPROC_UNVEIL 0x04 /* has unveil settings */ +#define EPROC_LKUNVEIL 0x08 /* unveil is locked */ int32_t p_exitsig; /* unused, always zero. */ int32_t p_flag; /* INT: P_* flags. */ @@ -623,8 +625,12 @@ do { \ \ if ((sess)->s_ttyvp) \ (kp)->p_eflag |= EPROC_CTTY; \ - if ((sess)->s_leader == (praddr)) \ - (kp)->p_eflag |= EPROC_SLEADER; \ + if ((pr)->ps_uvpaths) \ + (kp)->p_eflag |= EPROC_UNVEIL; \ + if ((pr)->ps_uvdone || \ + (((pr)->ps_flags & PS_PLEDGE) && \ + ((pr)->ps_pledge & PLEDGE_UNVEIL) == 0)) \ + (kp)->p_eflag |= EPROC_LKUNVEIL; \ \ if (((pr)->ps_flags & (PS_EMBRYO | PS_ZOMBIE)) == 0) { \ if ((vm) != NULL) { \ |