diff options
Diffstat (limited to 'freebsd/sys/kern')
| -rw-r--r-- | freebsd/sys/kern/sys_generic.c | 8 | ||||
| -rw-r--r-- | freebsd/sys/kern/uipc_syscalls.c | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/freebsd/sys/kern/sys_generic.c b/freebsd/sys/kern/sys_generic.c index 2ee0ae70..6b26dbeb 100644 --- a/freebsd/sys/kern/sys_generic.c +++ b/freebsd/sys/kern/sys_generic.c @@ -1614,6 +1614,9 @@ pollrescan(struct thread *td) * POLLERR if appropriate. */ fd->revents = fo_poll(fp, fd->events, td->td_ucred, td); +#ifdef __rtems__ + rtems_libio_iop_drop(&fp->f_io); +#endif /* __rtems__ */ if (fd->revents != 0) n++; } @@ -1671,7 +1674,7 @@ pollscan(td, fds, nfd) #ifndef __rtems__ if (fds->fd > fdp->fd_lastfile) { #else /* __rtems__ */ - if (fds->fd >= rtems_libio_number_iops) { + if ((uint32_t)fds->fd >= rtems_libio_number_iops) { #endif /* __rtems__ */ fds->revents = POLLNVAL; n++; @@ -1701,6 +1704,9 @@ pollscan(td, fds, nfd) selfdalloc(td, fds); fds->revents = fo_poll(fp, fds->events, td->td_ucred, td); +#ifdef __rtems__ + rtems_libio_iop_drop(&fp->f_io); +#endif /* __rtems__ */ /* * POSIX requires POLLOUT to be never * set simultaneously with POLLHUP. diff --git a/freebsd/sys/kern/uipc_syscalls.c b/freebsd/sys/kern/uipc_syscalls.c index fa948c78..3c6d7efd 100644 --- a/freebsd/sys/kern/uipc_syscalls.c +++ b/freebsd/sys/kern/uipc_syscalls.c @@ -126,11 +126,16 @@ rtems_bsd_getsock(int fd, struct file **fpp, u_int *fflagp) int error; if ((uint32_t) fd < rtems_libio_number_iops) { + unsigned int flags; + fp = rtems_bsd_fd_to_fp(fd); - if ((fp->f_io.flags & LIBIO_FLAGS_OPEN) != LIBIO_FLAGS_OPEN) { + flags = rtems_libio_iop_hold(&fp->f_io); + if ((flags & LIBIO_FLAGS_OPEN) == 0) { + rtems_libio_iop_drop(&fp->f_io); fp = NULL; error = EBADF; } else if (fp->f_io.pathinfo.handlers != &socketops) { + rtems_libio_iop_drop(&fp->f_io); fp = NULL; error = ENOTSOCK; } else { |