diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/sys_generic.c | 3 | ||||
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 687e4f9..bf33a4d 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -69,13 +69,12 @@ MALLOC_DEFINE(M_IOV, "iov", "large iov's"); static int pollscan __P((struct proc *, struct pollfd *, int)); static int selscan __P((struct proc *, fd_mask **, fd_mask **, int)); -static struct file* getfp __P((struct filedesc *, int, int)); static int dofileread __P((struct proc *, struct file *, int, void *, size_t, off_t, int)); static int dofilewrite __P((struct proc *, struct file *, int, const void *, size_t, off_t, int)); -static struct file* +struct file* getfp(fdp, fd, flag) struct filedesc* fdp; int fd, flag; diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 298bbe1..480b8dc 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1432,9 +1432,8 @@ sendfile(struct proc *p, struct sendfile_args *uap) * Do argument checking. Must be a regular file in, stream * type and connected socket out, positive offset. */ - if (((u_int)uap->fd) >= fdp->fd_nfiles || - (fp = fdp->fd_ofiles[uap->fd]) == NULL || - (fp->f_flag & FREAD) == 0) { + fp = getfp(fdp, uap->fd, FREAD); + if (fp == NULL) { error = EBADF; goto done; } |
