mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-08 09:29:03 +00:00
Code Issues Releases Activity

Fix emulation of the fcntl64() syscall. In Linux, this is exactly

Browse Source 
the same as fcntl() except that it supports the new 64-bit file
locking commands (LINUX_F_GETLK64 etc) that use the `flock64'
structure. We had been interpreting all flock structures passed to
fcntl64() as `struct flock64' instead of only the ones from F_*64
commands.

The glibc in linux_base-7 uses fcntl64() by default, but the bug
was often non-fatal since the misinterpretation typically only
causes junk to appear in the `l_len' field and most junk values are
accepted as valid range lengths. The result is occasional EINVAL
errors from F_SETLK and a few bytes after the supplied `struct
flock' getting clobbered during F_GETLK.

PR:		kern/37656
Reviewed by:	marcel
Approved by:	re
MFC after:	1 week
This commit is contained in:
Ian Dowse 2002-12-08 18:30:44 +00:00
parent f7883a793c
commit 42d5b03cfc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=107680
1 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
sys/compat/linux/linux_file.c
View File

@ -931,6 +931,8 @@ bsd_to_linux_flock64(struct flock *bsd_flock, struct l_flock64 *linux_flock)
static int
fcntl_common(struct thread *td, struct linux_fcntl64_args *args)
{
struct l_flock linux_flock;
struct flock bsd_flock;
struct file *fp;
long arg;
int error, result;
@ -977,44 +979,6 @@ fcntl_common(struct thread *td, struct linux_fcntl64_args *args)
arg |= O_ASYNC;
return (kern_fcntl(td, args->fd, F_SETFL, arg));
case LINUX_F_GETOWN:
return (kern_fcntl(td, args->fd, F_GETOWN, 0));
case LINUX_F_SETOWN:
/*
* XXX some Linux applications depend on F_SETOWN having no
* significant effect for pipes (SIGIO is not delivered for
* pipes under Linux-2.2.35 at least).
*/
error = fget(td, args->fd, &fp);
if (error)
return (error);
if (fp->f_type == DTYPE_PIPE) {
fdrop(fp, td);
return (EINVAL);
}
fdrop(fp, td);
return (kern_fcntl(td, args->fd, F_SETOWN, args->arg));
}
return (EINVAL);
}
int
linux_fcntl(struct thread *td, struct linux_fcntl_args *args)
{
struct linux_fcntl64_args args64;
struct l_flock linux_flock;
struct flock bsd_flock;
int error;
#ifdef DEBUG
if (ldebug(fcntl))
printf(ARGS(fcntl, "%d, %08x, *"), args->fd, args->cmd);
#endif
switch (args->cmd) {
case LINUX_F_GETLK:
error = copyin((caddr_t)args->arg, &linux_flock,
sizeof(linux_flock));
@ -1045,8 +1009,41 @@ linux_fcntl(struct thread *td, struct linux_fcntl_args *args)
linux_to_bsd_flock(&linux_flock, &bsd_flock);
return (kern_fcntl(td, args->fd, F_SETLKW,
(intptr_t)&bsd_flock));
case LINUX_F_GETOWN:
return (kern_fcntl(td, args->fd, F_GETOWN, 0));
case LINUX_F_SETOWN:
/*
* XXX some Linux applications depend on F_SETOWN having no
* significant effect for pipes (SIGIO is not delivered for
* pipes under Linux-2.2.35 at least).
*/
error = fget(td, args->fd, &fp);
if (error)
return (error);
if (fp->f_type == DTYPE_PIPE) {
fdrop(fp, td);
return (EINVAL);
}
fdrop(fp, td);
return (kern_fcntl(td, args->fd, F_SETOWN, args->arg));
}
return (EINVAL);
}
int
linux_fcntl(struct thread *td, struct linux_fcntl_args *args)
{
struct linux_fcntl64_args args64;
#ifdef DEBUG
if (ldebug(fcntl))
printf(ARGS(fcntl, "%d, %08x, *"), args->fd, args->cmd);
#endif
args64.fd = args->fd;
args64.cmd = args->cmd;
args64.arg = args->arg;
@ -1067,7 +1064,6 @@ linux_fcntl64(struct thread *td, struct linux_fcntl64_args *args)
#endif
switch (args->cmd) {
case LINUX_F_GETLK:
case LINUX_F_GETLK64:
error = copyin((caddr_t)args->arg, &linux_flock,
sizeof(linux_flock));
@ -1081,7 +1077,6 @@ linux_fcntl64(struct thread *td, struct linux_fcntl64_args *args)
return (copyout(&linux_flock, (caddr_t)args->arg,
sizeof(linux_flock)));
case LINUX_F_SETLK:
case LINUX_F_SETLK64:
error = copyin((caddr_t)args->arg, &linux_flock,
sizeof(linux_flock));
@ -1091,7 +1086,6 @@ linux_fcntl64(struct thread *td, struct linux_fcntl64_args *args)
return (kern_fcntl(td, args->fd, F_SETLK,
(intptr_t)&bsd_flock));
case LINUX_F_SETLKW:
case LINUX_F_SETLKW64:
error = copyin((caddr_t)args->arg, &linux_flock,
sizeof(linux_flock));