diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2018-04-18 09:56:58 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2018-04-18 09:56:58 +0000 |
| commit | e0321e6fcb6a37209a6773aa2deb00cceb8809a7 (patch) | |
| tree | c9ca40e2551020fa8bcbd232f0201ac2d6f2f905 | |
| parent | bf9e5c04ec5cf2ea595062420b9b5108abce0c09 (diff) | |
Call FREF(9) earlier instead of incrementing `f_count' by hand.
ok millert@, visa@
| -rw-r--r-- | sys/kern/uipc_usrreq.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 21dd72def41..5b25914ee8c 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_usrreq.c,v 1.123 2018/01/04 10:45:30 mpi Exp $ */ +/* $OpenBSD: uipc_usrreq.c,v 1.124 2018/04/18 09:56:57 mpi Exp $ */ /* $NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $ */ /* @@ -838,6 +838,7 @@ morespace: error = EBADF; goto fail; } + FREF(fp); if (fp->f_count == LONG_MAX-2) { error = EDEADLK; goto fail; @@ -845,7 +846,7 @@ morespace: error = pledge_sendfd(p, fp); if (error) goto fail; - + /* kqueue descriptors cannot be copied */ if (fp->f_type == DTYPE_KQUEUE) { error = EINVAL; @@ -854,7 +855,6 @@ morespace: rp->fp = fp; rp->flags = fdp->fd_ofileflags[fd] & UF_PLEDGED; rp--; - fp->f_count++; if ((unp = fptounp(fp)) != NULL) { unp->unp_file = fp; unp->unp_msgcount++; @@ -863,13 +863,15 @@ morespace: } return (0); fail: + if (fp != NULL) + FRELE(fp, p); /* Back out what we just did. */ for ( ; i > 0; i--) { rp++; fp = rp->fp; - fp->f_count--; if ((unp = fptounp(fp)) != NULL) unp->unp_msgcount--; + FRELE(fp, p); unp_rights--; } |