diff options
| author | sef <sef@FreeBSD.org> | 1997-12-20 03:05:47 +0000 |
|---|---|---|
| committer | sef <sef@FreeBSD.org> | 1997-12-20 03:05:47 +0000 |
| commit | f4669f67bc8626da80c2d579536287ecf2591d0f (patch) | |
| tree | 23fa5336895d623870954d25c73d37c78cc2abdf /sys/fs/procfs | |
| parent | 6a523666f710366947056d9583488471279a3602 (diff) | |
| download | FreeBSD-src-f4669f67bc8626da80c2d579536287ecf2591d0f.zip FreeBSD-src-f4669f67bc8626da80c2d579536287ecf2591d0f.tar.gz | |
Clear the p_stops field on change of user/group id, unless the correct
flag is set in the p_pfsflags field. This, essentially, prevents an SUID
proram from hanging after being traced. (E.g., "truss /usr/bin/rlogin" would
fail, but leave rlogin in a stopevent state.) Yet another case where procctl
is (hopefully ;)) no longer needed in the general case.
Reviewed by: bde (thanks bruce :))
Diffstat (limited to 'sys/fs/procfs')
| -rw-r--r-- | sys/fs/procfs/procfs_vnops.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c index 9a40ea3..7f6c8b6 100644 --- a/sys/fs/procfs/procfs_vnops.c +++ b/sys/fs/procfs/procfs_vnops.c @@ -36,7 +36,7 @@ * * @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95 * - * $Id: procfs_vnops.c,v 1.47 1997/12/12 03:33:43 sef Exp $ + * $Id: procfs_vnops.c,v 1.48 1997/12/13 03:13:46 sef Exp $ */ /* @@ -224,11 +224,13 @@ procfs_ioctl(ap) struct vop_ioctl_args *ap; { struct pfsnode *pfs = VTOPFS(ap->a_vp); - struct proc *procp; + struct proc *procp, *p; int error; int signo; struct procfs_status *psp; + unsigned char flags; + p = ap->a_p; procp = pfind(pfs->pfs_pid); if (procp == NULL) { return ENOTTY; @@ -242,7 +244,15 @@ procfs_ioctl(ap) procp->p_stops &= ~*(unsigned int*)ap->a_data; break; case PIOCSFL: - procp->p_pfsflags = (unsigned char)*(unsigned int*)ap->a_data; + /* + * NFLAGS is "non-suser flags" -- currently, only + * PFS_ISUGID ("ignore set u/g id"); + */ +#define NFLAGS (PF_ISUGID) + flags = (unsigned char)*(unsigned int*)ap->a_data; + if (flags & NFLAGS && (error = suser(p->p_ucred, &p->p_acflag))) + return error; + procp->p_pfsflags = flags; break; case PIOCGFL: *(unsigned int*)ap->a_data = (unsigned int)procp->p_pfsflags; |
