summaryrefslogtreecommitdiff
path: root/sys/miscfs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/miscfs')
-rw-r--r--sys/miscfs/procfs/procfs.h2
-rw-r--r--sys/miscfs/procfs/procfs_ctl.c3
-rw-r--r--sys/miscfs/procfs/procfs_dbregs.c3
-rw-r--r--sys/miscfs/procfs/procfs_fpregs.c3
-rw-r--r--sys/miscfs/procfs/procfs_mem.c3
-rw-r--r--sys/miscfs/procfs/procfs_regs.c3
-rw-r--r--sys/miscfs/procfs/procfs_status.c4
-rw-r--r--sys/miscfs/procfs/procfs_vnops.c6
8 files changed, 2 insertions, 25 deletions
diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h
index 9236cbf6cd70d..efc982a4da456 100644
--- a/sys/miscfs/procfs/procfs.h
+++ b/sys/miscfs/procfs/procfs.h
@@ -97,7 +97,7 @@ struct pfsnode {
((((p1)->p_cred->pc_ucred->cr_uid == (p2)->p_cred->p_ruid) && \
((p1)->p_cred->p_ruid == (p2)->p_cred->p_ruid) && \
((p1)->p_cred->p_svuid == (p2)->p_cred->p_ruid) && \
- ((p2)->p_flag & (P_SUGID|P_INEXEC)) == 0) || \
+ ((p2)->p_flag & P_SUGID) == 0) || \
(suser_xxx((p1)->p_cred->pc_ucred, (p1), PRISON_ROOT) == 0))
/*
diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c
index 6370e8b059124..2192dbe5afa1c 100644
--- a/sys/miscfs/procfs/procfs_ctl.c
+++ b/sys/miscfs/procfs/procfs_ctl.c
@@ -110,9 +110,6 @@ procfs_control(curp, p, op)
{
int error;
- /* Can't trace a process that's currently exec'ing. */
- if ((p->p_flag & P_INEXEC) != 0)
- return EAGAIN;
/*
* Authorization check: rely on normal debugging protection, except
* allow processes to disengage debugging on a process onto which
diff --git a/sys/miscfs/procfs/procfs_dbregs.c b/sys/miscfs/procfs/procfs_dbregs.c
index 9fe4968d37c62..b4e9d41f668c8 100644
--- a/sys/miscfs/procfs/procfs_dbregs.c
+++ b/sys/miscfs/procfs/procfs_dbregs.c
@@ -62,9 +62,6 @@ procfs_dodbregs(curp, p, pfs, uio)
char *kv;
int kl;
- /* Can't trace a process that's currently exec'ing. */
- if ((p->p_flag & P_INEXEC) != 0)
- return EAGAIN;
if (!CHECKIO(curp, p) || p_trespass(curp, p))
return (EPERM);
kl = sizeof(r);
diff --git a/sys/miscfs/procfs/procfs_fpregs.c b/sys/miscfs/procfs/procfs_fpregs.c
index 7074148cfbfc0..cd5fa7426fe67 100644
--- a/sys/miscfs/procfs/procfs_fpregs.c
+++ b/sys/miscfs/procfs/procfs_fpregs.c
@@ -59,9 +59,6 @@ procfs_dofpregs(curp, p, pfs, uio)
char *kv;
int kl;
- /* Can't trace a process that's currently exec'ing. */
- if ((p->p_flag & P_INEXEC) != 0)
- return EAGAIN;
if (!CHECKIO(curp, p) || p_trespass(curp, p))
return EPERM;
kl = sizeof(r);
diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c
index 7e59c4dded62b..4994aa6c830ac 100644
--- a/sys/miscfs/procfs/procfs_mem.c
+++ b/sys/miscfs/procfs/procfs_mem.c
@@ -244,9 +244,6 @@ procfs_domem(curp, p, pfs, uio)
if (uio->uio_resid == 0)
return (0);
- /* Can't trace a process that's currently exec'ing. */
- if ((p->p_flag & P_INEXEC) != 0)
- return EAGAIN;
if (!CHECKIO(curp, p) || p_trespass(curp, p))
return EPERM;
diff --git a/sys/miscfs/procfs/procfs_regs.c b/sys/miscfs/procfs/procfs_regs.c
index ccde00af6da51..65659eafe7a66 100644
--- a/sys/miscfs/procfs/procfs_regs.c
+++ b/sys/miscfs/procfs/procfs_regs.c
@@ -60,9 +60,6 @@ procfs_doregs(curp, p, pfs, uio)
char *kv;
int kl;
- /* Can't trace a process that's currently exec'ing. */
- if ((p->p_flag & P_INEXEC) != 0)
- return EAGAIN;
if (!CHECKIO(curp, p) || p_trespass(curp, p))
return EPERM;
kl = sizeof(r);
diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c
index b8cc6dbe9f919..8c1707584482f 100644
--- a/sys/miscfs/procfs/procfs_status.c
+++ b/sys/miscfs/procfs/procfs_status.c
@@ -211,9 +211,7 @@ procfs_docmdline(curp, p, pfs, uio)
*/
if (p->p_args &&
- (ps_argsopen || (CHECKIO(curp, p) &&
- (p->p_flag & P_INEXEC) == 0 &&
- !p_trespass(curp, p)))) {
+ (ps_argsopen || (CHECKIO(curp, p) && !p_trespass(curp, p)))) {
bp = p->p_args->ar_args;
buflen = p->p_args->ar_length;
buf = 0;
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 48b4765baa9be..a0dd3986655b7 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -148,9 +148,6 @@ procfs_open(ap)
return (EBUSY);
p1 = ap->a_p;
- /* Can't trace a process that's currently exec'ing. */
- if ((p2->p_flag & P_INEXEC) != 0)
- return EAGAIN;
if (!CHECKIO(p1, p2) || p_trespass(p1, p2))
return (EPERM);
@@ -242,9 +239,6 @@ procfs_ioctl(ap)
return ENOTTY;
}
- /* Can't trace a process that's currently exec'ing. */
- if ((procp->p_flag & P_INEXEC) != 0)
- return EAGAIN;
if (!CHECKIO(p, procp) || p_trespass(p, procp))
return EPERM;