diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-10-26 12:03:29 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-10-26 12:03:29 +0000 |
| commit | eb46b9853439c27012a22a86f3d9139930a9e87a (patch) | |
| tree | 0668f2d444b8c90d902fc4d94aaf484b512bab93 /sys/compat/ultrix/ultrix_ioctl.c | |
| parent | 322ae2c6b01056eccf34722ee78713e1b3337123 (diff) | |
- every new fd created by falloc() is marked as larval and should not be used
any anyone. Every caller of falloc matures the fd when it's usable.
- Since every lookup in the fd table must now check this flag and all of
them do the same thing, move all the necessary checks into a function -
fd_getfile.
Diffstat (limited to 'sys/compat/ultrix/ultrix_ioctl.c')
| -rw-r--r-- | sys/compat/ultrix/ultrix_ioctl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/compat/ultrix/ultrix_ioctl.c b/sys/compat/ultrix/ultrix_ioctl.c index 18a35fec97a..4c80fc8f5f7 100644 --- a/sys/compat/ultrix/ultrix_ioctl.c +++ b/sys/compat/ultrix/ultrix_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ultrix_ioctl.c,v 1.7 1997/04/12 19:57:59 graichen Exp $ */ +/* $OpenBSD: ultrix_ioctl.c,v 1.8 2001/10/26 12:03:27 art Exp $ */ /* $NetBSD: ultrix_ioctl.c,v 1.3.4.1 1996/06/13 18:22:37 jonathan Exp $ */ /* from : NetBSD: sunos_ioctl.c,v 1.21 1995/10/07 06:27:31 mycroft Exp */ @@ -449,8 +449,7 @@ ultrix_sys_ioctl(p, v, retval) register int (*ctl)(); int error; - if ( (unsigned)SCARG(uap, fd) >= fdp->fd_nfiles || - (fp = fdp->fd_ofiles[SCARG(uap, fd)]) == NULL) + if ((fp = fd_getfile(fdp, SCARG(uap, fd))) == NULL) return EBADF; if ((fp->f_flag & (FREAD|FWRITE)) == 0) |