diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -115,6 +115,8 @@ static void fdgrowtable_exp(struct filedesc *fdp, int nfd); static void fdunused(struct filedesc *fdp, int fd); static void fdused(struct filedesc *fdp, int fd); +static int fget_unlocked_seq(struct filedesc *fdp, int fd, + cap_rights_t *needrightsp, struct file **fpp, seqc_t *seqp); static int getmaxfd(struct thread *td); static u_long *filecaps_copy_prep(const struct filecaps *src); static void filecaps_copy_finish(const struct filecaps *src, @@ -2843,6 +2845,7 @@ FILEDESC_LOCK_ASSERT(fdp); + *fpp = NULL; fde = fdeget_locked(fdp, fd); if (fde == NULL) { error = EBADF; @@ -3014,7 +3017,7 @@ } #endif -int +static int fget_unlocked_seq(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, struct file **fpp, seqc_t *seqp) { @@ -3112,8 +3115,10 @@ #endif fdt = fdp->fd_files; - if (__predict_false((u_int)fd >= fdt->fdt_nfiles)) + if (__predict_false((u_int)fd >= fdt->fdt_nfiles)) { + *fpp = NULL; return (EBADF); + } #ifdef CAPABILITIES seq = seqc_read_notmodify(fd_seqc(fdt, fd)); fde = &fdt->fdt_ofiles[fd]; @@ -3148,6 +3153,7 @@ out_fdrop: fdrop(fp, curthread); out_fallback: + *fpp = NULL; return (fget_unlocked_seq(fdp, fd, needrightsp, fpp, NULL)); } @@ -3173,6 +3179,7 @@ MPASS(FILEDESC_IS_ONLY_USER(fdp)); + *fpp = NULL; if (__predict_false(fd >= fdp->fd_nfiles)) return (EBADF); @@ -3198,6 +3205,7 @@ MPASS(FILEDESC_IS_ONLY_USER(fdp)); + *fpp = NULL; if (__predict_false(fd >= fdp->fd_nfiles)) return (EBADF); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -4336,6 +4336,7 @@ */ if (__predict_false(fp->f_vnode == NULL || fp->f_ops == &badfileops)) { fdrop(fp, td); + *fpp = NULL; return (EINVAL); } @@ -4363,6 +4364,7 @@ */ if (__predict_false((*fpp)->f_ops == &path_fileops)) { fdrop(*fpp, td); + *fpp = NULL; error = EBADF; } diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -269,10 +269,7 @@ struct file **fpp, struct filecaps *havecapsp); int fget_cap(struct thread *td, int fd, cap_rights_t *needrightsp, struct file **fpp, struct filecaps *havecapsp); - /* Return a referenced file from an unlocked descriptor. */ -int fget_unlocked_seq(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, - struct file **fpp, seqc_t *seqp); int fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, struct file **fpp); /* Return a file pointer without a ref. FILEDESC_IS_ONLY_USER must be true. */