diff options
| author | bde <bde@FreeBSD.org> | 1998-07-15 06:10:16 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-07-15 06:10:16 +0000 |
| commit | e006ba669f17c0c9aa8d728ab0024243dc5095fd (patch) | |
| tree | 28009f747e30640d31edbb9e886c95da6401e672 | |
| parent | ab2debff1bd73dae58bc0ecf7bee4237a683082e (diff) | |
| download | FreeBSD-src-e006ba669f17c0c9aa8d728ab0024243dc5095fd.zip FreeBSD-src-e006ba669f17c0c9aa8d728ab0024243dc5095fd.tar.gz | |
Cast longs to intptr_t before casting them to pointers.
Fixed bitrot in pseudo-declaration of `struct fcntl_args'. fcntl()
is now broken in some cases when ints are larger than longs.
| -rw-r--r-- | sys/kern/kern_descrip.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 985d844..f7d5136 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $Id: kern_descrip.c,v 1.52 1998/05/11 03:55:24 dyson Exp $ + * $Id: kern_descrip.c,v 1.53 1998/06/10 10:27:43 dfr Exp $ */ #include "opt_compat.h" @@ -196,7 +196,7 @@ dup(p, uap) struct fcntl_args { int fd; int cmd; - int arg; + long arg; }; #endif /* ARGSUSED */ @@ -291,7 +291,8 @@ fcntl(p, uap) return (EBADF); vp = (struct vnode *)fp->f_data; /* Copy in the lock structure */ - error = copyin((caddr_t)uap->arg, (caddr_t)&fl, sizeof (fl)); + error = copyin((caddr_t)(intptr_t)uap->arg, (caddr_t)&fl, + sizeof(fl)); if (error) return (error); if (fl.l_whence == SEEK_CUR) @@ -323,7 +324,8 @@ fcntl(p, uap) return (EBADF); vp = (struct vnode *)fp->f_data; /* Copy in the lock structure */ - error = copyin((caddr_t)uap->arg, (caddr_t)&fl, sizeof (fl)); + error = copyin((caddr_t)(intptr_t)uap->arg, (caddr_t)&fl, + sizeof(fl)); if (error) return (error); if (fl.l_type != F_RDLCK && fl.l_type != F_WRLCK && @@ -333,7 +335,8 @@ fcntl(p, uap) fl.l_start += fp->f_offset; if ((error = VOP_ADVLOCK(vp,(caddr_t)p,F_GETLK,&fl,F_POSIX))) return (error); - return (copyout((caddr_t)&fl, (caddr_t)uap->arg, sizeof (fl))); + return (copyout((caddr_t)&fl, (caddr_t)(intptr_t)uap->arg, + sizeof(fl))); default: return (EINVAL); |
