diff options
| author |   bluhm <bluhm@openbsd.org> | 2018-04-06 10:48:09 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2018-04-06 10:48:09 +0000 |
| commit | 3f03dea1a10f36b448464d3dd2b75a1f38516158 (patch) | |
| tree | 6032d57d38616cb9acb3b63cb40137060a71bbe0 | |
| parent | All users of the PFLOG_PACKET() macro are inside "#if NPFLOG > 0". (diff) | |
| download | wireguard-openbsd-3f03dea1a10f36b448464d3dd2b75a1f38516158.tar.xz wireguard-openbsd-3f03dea1a10f36b448464d3dd2b75a1f38516158.zip | |
Retain the UF_PLEDGED flag from the original fd during dup(2).
Nothing uses this fd-tracking part of pledge yet.
OK deraadt@
| -rw-r--r-- | sys/kern/kern_descrip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index dde0442521a..3cbbee21228 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_descrip.c,v 1.144 2018/04/03 09:00:03 mpi Exp $ */ +/* $OpenBSD: kern_descrip.c,v 1.145 2018/04/06 10:48:09 bluhm Exp $ */ /* $NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $ */ /* @@ -615,7 +615,7 @@ finishdup(struct proc *p, struct file *fp, int old, int new, FREF(oldfp); fdp->fd_ofiles[new] = fp; - fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] & ~(UF_EXCLOSE|UF_PLEDGED); + fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] & ~UF_EXCLOSE; fp->f_count++; FRELE(fp, p); if (dup2 && oldfp == NULL) |