diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-11-10 11:01:39 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-11-10 11:01:54 +0100 |
| commit | 72d5fa11a8e3a0e4640da289d76ae672eb070565 (patch) | |
| tree | d0a8362fffca074cb753e8a4d4c4aabc7ce5cbeb /freebsd/sys/kern | |
| parent | Change RTEMS version to 5 (diff) | |
| download | rtems-libbsd-72d5fa11a8e3a0e4640da289d76ae672eb070565.tar.bz2 | |
Fix reference counting for file descriptors
Update #3132.
Diffstat (limited to 'freebsd/sys/kern')
| -rw-r--r-- | freebsd/sys/kern/kern_event.c | 2 | ||||
| -rwxr-xr-x | freebsd/sys/kern/sys_pipe.c | 6 | ||||
| -rw-r--r-- | freebsd/sys/kern/uipc_syscalls.c | 10 |
3 files changed, 18 insertions, 0 deletions
diff --git a/freebsd/sys/kern/kern_event.c b/freebsd/sys/kern/kern_event.c index ed1a9dab..0a64adbe 100644 --- a/freebsd/sys/kern/kern_event.c +++ b/freebsd/sys/kern/kern_event.c @@ -939,7 +939,9 @@ kern_kqueue(struct thread *td, int flags, struct filecaps *fcaps) #endif /* __rtems__ */ finit(fp, FREAD | FWRITE, DTYPE_KQUEUE, kq, &kqueueops); +#ifndef __rtems__ fdrop(fp, td); +#endif /* __rtems__ */ td->td_retval[0] = fd; return (0); diff --git a/freebsd/sys/kern/sys_pipe.c b/freebsd/sys/kern/sys_pipe.c index 1636280f..08dd619a 100755 --- a/freebsd/sys/kern/sys_pipe.c +++ b/freebsd/sys/kern/sys_pipe.c @@ -485,16 +485,22 @@ kern_pipe(struct thread *td, int fildes[2], int flags, struct filecaps *fcaps1, error = falloc_caps(td, &wf, &fd, flags, fcaps2); if (error) { fdclose(td, rf, fildes[0]); +#ifndef __rtems__ fdrop(rf, td); +#endif /* __rtems__ */ /* rpipe has been closed by fdrop(). */ pipeclose(wpipe); return (error); } /* An extra reference on `wf' has been held for us by falloc_caps(). */ finit(wf, fflags, DTYPE_PIPE, wpipe, &pipeops); +#ifndef __rtems__ fdrop(wf, td); +#endif /* __rtems__ */ fildes[1] = fd; +#ifndef __rtems__ fdrop(rf, td); +#endif /* __rtems__ */ return (0); } diff --git a/freebsd/sys/kern/uipc_syscalls.c b/freebsd/sys/kern/uipc_syscalls.c index 3c6d7efd..62101b5e 100644 --- a/freebsd/sys/kern/uipc_syscalls.c +++ b/freebsd/sys/kern/uipc_syscalls.c @@ -214,7 +214,9 @@ kern_socket(struct thread *td, int domain, int type, int protocol) (void) fo_ioctl(fp, FIONBIO, &fflag, td->td_ucred, td); td->td_retval[0] = fd; } +#ifndef __rtems__ fdrop(fp, td); +#endif /* __rtems__ */ return (error); } #ifdef __rtems__ @@ -616,8 +618,10 @@ done: } else *fp = NULL; } +#ifndef __rtems__ if (nfp != NULL) fdrop(nfp, td); +#endif /* __rtems__ */ fdrop(headfp, td); return (error); } @@ -840,15 +844,21 @@ kern_socketpair(struct thread *td, int domain, int type, int protocol, (void) fo_ioctl(fp1, FIONBIO, &fflag, td->td_ucred, td); (void) fo_ioctl(fp2, FIONBIO, &fflag, td->td_ucred, td); } +#ifndef __rtems__ fdrop(fp1, td); fdrop(fp2, td); +#endif /* __rtems__ */ return (0); free4: fdclose(td, fp2, rsv[1]); +#ifndef __rtems__ fdrop(fp2, td); +#endif /* __rtems__ */ free3: fdclose(td, fp1, rsv[0]); +#ifndef __rtems__ fdrop(fp1, td); +#endif /* __rtems__ */ free2: if (so2 != NULL) (void)soclose(so2); |