2005-04-17 02:20:36 +04:00
/*
* linux / fs / compat . c
*
* Kernel compatibililty routines for e . g . 32 bit syscall support
* on 64 bit kernels .
*
* Copyright ( C ) 2002 Stephen Rothwell , IBM Corporation
* Copyright ( C ) 1997 - 2000 Jakub Jelinek ( jakub @ redhat . com )
* Copyright ( C ) 1998 Eddie C . Dost ( ecd @ skynet . be )
* Copyright ( C ) 2001 , 2002 Andi Kleen , SuSE Labs
2010-07-18 16:27:13 +04:00
* Copyright ( C ) 2003 Pavel Machek ( pavel @ ucw . cz )
2005-04-17 02:20:36 +04:00
*
* This program is free software ; you can redistribute it and / or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation .
*/
2010-08-10 04:20:22 +04:00
# include <linux/stddef.h>
2007-05-08 11:29:02 +04:00
# include <linux/kernel.h>
2005-04-17 02:20:36 +04:00
# include <linux/linkage.h>
# include <linux/compat.h>
# include <linux/errno.h>
# include <linux/time.h>
2017-02-02 19:54:15 +03:00
# include <linux/cred.h>
2005-04-17 02:20:36 +04:00
# include <linux/fs.h>
# include <linux/fcntl.h>
# include <linux/namei.h>
# include <linux/file.h>
2008-04-24 15:44:08 +04:00
# include <linux/fdtable.h>
2005-04-17 02:20:36 +04:00
# include <linux/vfs.h>
# include <linux/ioctl.h>
# include <linux/init.h>
# include <linux/ncp_mount.h>
2005-04-18 21:54:51 +04:00
# include <linux/nfs4_mount.h>
2005-04-17 02:20:36 +04:00
# include <linux/syscalls.h>
# include <linux/ctype.h>
# include <linux/dirent.h>
[PATCH] inotify
inotify is intended to correct the deficiencies of dnotify, particularly
its inability to scale and its terrible user interface:
* dnotify requires the opening of one fd per each directory
that you intend to watch. This quickly results in too many
open files and pins removable media, preventing unmount.
* dnotify is directory-based. You only learn about changes to
directories. Sure, a change to a file in a directory affects
the directory, but you are then forced to keep a cache of
stat structures.
* dnotify's interface to user-space is awful. Signals?
inotify provides a more usable, simple, powerful solution to file change
notification:
* inotify's interface is a system call that returns a fd, not SIGIO.
You get a single fd, which is select()-able.
* inotify has an event that says "the filesystem that the item
you were watching is on was unmounted."
* inotify can watch directories or files.
Inotify is currently used by Beagle (a desktop search infrastructure),
Gamin (a FAM replacement), and other projects.
See Documentation/filesystems/inotify.txt.
Signed-off-by: Robert Love <rml@novell.com>
Cc: John McCutchan <ttb@tentacle.dhs.org>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-13 01:06:03 +04:00
# include <linux/fsnotify.h>
2005-04-17 02:20:36 +04:00
# include <linux/highuid.h>
# include <linux/personality.h>
# include <linux/rwsem.h>
2006-10-01 10:28:59 +04:00
# include <linux/tsacct_kern.h>
2007-05-08 11:29:21 +04:00
# include <linux/security.h>
2006-10-20 00:08:53 +04:00
# include <linux/highmem.h>
2007-05-11 09:23:15 +04:00
# include <linux/signal.h>
2006-10-20 01:23:57 +04:00
# include <linux/poll.h>
2005-09-15 08:40:00 +04:00
# include <linux/mm.h>
2009-03-30 15:20:30 +04:00
# include <linux/fs_struct.h>
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 11:04:11 +03:00
# include <linux/slab.h>
2010-10-30 19:19:35 +04:00
# include <linux/pagemap.h>
2013-05-08 03:19:08 +04:00
# include <linux/aio.h>
2005-04-17 02:20:36 +04:00
2016-12-24 22:46:01 +03:00
# include <linux/uaccess.h>
2005-04-17 02:20:36 +04:00
# include <asm/mmu_context.h>
# include <asm/ioctls.h>
2006-09-30 22:52:18 +04:00
# include "internal.h"
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
2005-04-17 02:20:36 +04:00
/*
* Not all architectures have sys_utime , so implement this in terms
* of sys_utimes .
*/
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE2 ( utime , const char __user * , filename ,
struct compat_utimbuf __user * , t )
2005-04-17 02:20:36 +04:00
{
utimensat implementation
Implement utimensat(2) which is an extension to futimesat(2) in that it
a) supports nano-second resolution for the timestamps
b) allows to selectively ignore the atime/mtime value
c) allows to selectively use the current time for either atime or mtime
d) supports changing the atime/mtime of a symlink itself along the lines
of the BSD lutimes(3) functions
For this change the internally used do_utimes() functions was changed to
accept a timespec time value and an additional flags parameter.
Additionally the sys_utime function was changed to match compat_sys_utime
which already use do_utimes instead of duplicating the work.
Also, the completely missing futimensat() functionality is added. We have
such a function in glibc but we have to resort to using /proc/self/fd/* which
not everybody likes (chroot etc).
Test application (the syscall number will need per-arch editing):
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#include <sys/time.h>
#include <stddef.h>
#include <syscall.h>
#define __NR_utimensat 280
#define UTIME_NOW ((1l << 30) - 1l)
#define UTIME_OMIT ((1l << 30) - 2l)
int
main(void)
{
int status = 0;
int fd = open("ttt", O_RDWR|O_CREAT|O_EXCL, 0666);
if (fd == -1)
error (1, errno, "failed to create test file \"ttt\"");
struct stat64 st1;
if (fstat64 (fd, &st1) != 0)
error (1, errno, "fstat failed");
struct timespec t[2];
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
struct stat64 st2;
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0] = st1.st_atim;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_OMIT;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("atim not set");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim changed from zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_OMIT;
t[1] = st1.st_mtim;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("mtim changed from original time");
status = 1;
}
if (st2.st_mtim.tv_sec != st1.st_mtim.tv_sec
|| st2.st_mtim.tv_nsec != st1.st_mtim.tv_nsec)
{
puts ("mtim not set");
status = 1;
}
if (status != 0)
goto out;
sleep (2);
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_NOW;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_NOW;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
struct timeval tv;
gettimeofday(&tv,NULL);
if (st2.st_atim.tv_sec <= st1.st_atim.tv_sec
|| st2.st_atim.tv_sec > tv.tv_sec)
{
puts ("atim not set to NOW");
status = 1;
}
if (st2.st_mtim.tv_sec <= st1.st_mtim.tv_sec
|| st2.st_mtim.tv_sec > tv.tv_sec)
{
puts ("mtim not set to NOW");
status = 1;
}
if (symlink ("ttt", "tttsym") != 0)
error (1, errno, "cannot create symlink");
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "tttsym", t, AT_SYMLINK_NOFOLLOW) != 0)
error (1, errno, "utimensat failed");
if (lstat64 ("tttsym", &st2) != 0)
error (1, errno, "lstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("symlink atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("symlink mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 1;
t[0].tv_nsec = 0;
t[1].tv_sec = 1;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, fd, NULL, t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 1 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to one");
status = 1;
}
if (st2.st_mtim.tv_sec != 1 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to one");
status = 1;
}
if (status == 0)
puts ("all OK");
out:
close (fd);
unlink ("ttt");
unlink ("tttsym");
return status;
}
[akpm@linux-foundation.org: add missing i386 syscall table entry]
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:33:25 +04:00
struct timespec tv [ 2 ] ;
2005-04-17 02:20:36 +04:00
if ( t ) {
if ( get_user ( tv [ 0 ] . tv_sec , & t - > actime ) | |
get_user ( tv [ 1 ] . tv_sec , & t - > modtime ) )
return - EFAULT ;
utimensat implementation
Implement utimensat(2) which is an extension to futimesat(2) in that it
a) supports nano-second resolution for the timestamps
b) allows to selectively ignore the atime/mtime value
c) allows to selectively use the current time for either atime or mtime
d) supports changing the atime/mtime of a symlink itself along the lines
of the BSD lutimes(3) functions
For this change the internally used do_utimes() functions was changed to
accept a timespec time value and an additional flags parameter.
Additionally the sys_utime function was changed to match compat_sys_utime
which already use do_utimes instead of duplicating the work.
Also, the completely missing futimensat() functionality is added. We have
such a function in glibc but we have to resort to using /proc/self/fd/* which
not everybody likes (chroot etc).
Test application (the syscall number will need per-arch editing):
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#include <sys/time.h>
#include <stddef.h>
#include <syscall.h>
#define __NR_utimensat 280
#define UTIME_NOW ((1l << 30) - 1l)
#define UTIME_OMIT ((1l << 30) - 2l)
int
main(void)
{
int status = 0;
int fd = open("ttt", O_RDWR|O_CREAT|O_EXCL, 0666);
if (fd == -1)
error (1, errno, "failed to create test file \"ttt\"");
struct stat64 st1;
if (fstat64 (fd, &st1) != 0)
error (1, errno, "fstat failed");
struct timespec t[2];
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
struct stat64 st2;
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0] = st1.st_atim;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_OMIT;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("atim not set");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim changed from zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_OMIT;
t[1] = st1.st_mtim;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("mtim changed from original time");
status = 1;
}
if (st2.st_mtim.tv_sec != st1.st_mtim.tv_sec
|| st2.st_mtim.tv_nsec != st1.st_mtim.tv_nsec)
{
puts ("mtim not set");
status = 1;
}
if (status != 0)
goto out;
sleep (2);
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_NOW;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_NOW;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
struct timeval tv;
gettimeofday(&tv,NULL);
if (st2.st_atim.tv_sec <= st1.st_atim.tv_sec
|| st2.st_atim.tv_sec > tv.tv_sec)
{
puts ("atim not set to NOW");
status = 1;
}
if (st2.st_mtim.tv_sec <= st1.st_mtim.tv_sec
|| st2.st_mtim.tv_sec > tv.tv_sec)
{
puts ("mtim not set to NOW");
status = 1;
}
if (symlink ("ttt", "tttsym") != 0)
error (1, errno, "cannot create symlink");
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "tttsym", t, AT_SYMLINK_NOFOLLOW) != 0)
error (1, errno, "utimensat failed");
if (lstat64 ("tttsym", &st2) != 0)
error (1, errno, "lstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("symlink atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("symlink mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 1;
t[0].tv_nsec = 0;
t[1].tv_sec = 1;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, fd, NULL, t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 1 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to one");
status = 1;
}
if (st2.st_mtim.tv_sec != 1 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to one");
status = 1;
}
if (status == 0)
puts ("all OK");
out:
close (fd);
unlink ("ttt");
unlink ("tttsym");
return status;
}
[akpm@linux-foundation.org: add missing i386 syscall table entry]
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:33:25 +04:00
tv [ 0 ] . tv_nsec = 0 ;
tv [ 1 ] . tv_nsec = 0 ;
2005-04-17 02:20:36 +04:00
}
utimensat implementation
Implement utimensat(2) which is an extension to futimesat(2) in that it
a) supports nano-second resolution for the timestamps
b) allows to selectively ignore the atime/mtime value
c) allows to selectively use the current time for either atime or mtime
d) supports changing the atime/mtime of a symlink itself along the lines
of the BSD lutimes(3) functions
For this change the internally used do_utimes() functions was changed to
accept a timespec time value and an additional flags parameter.
Additionally the sys_utime function was changed to match compat_sys_utime
which already use do_utimes instead of duplicating the work.
Also, the completely missing futimensat() functionality is added. We have
such a function in glibc but we have to resort to using /proc/self/fd/* which
not everybody likes (chroot etc).
Test application (the syscall number will need per-arch editing):
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#include <sys/time.h>
#include <stddef.h>
#include <syscall.h>
#define __NR_utimensat 280
#define UTIME_NOW ((1l << 30) - 1l)
#define UTIME_OMIT ((1l << 30) - 2l)
int
main(void)
{
int status = 0;
int fd = open("ttt", O_RDWR|O_CREAT|O_EXCL, 0666);
if (fd == -1)
error (1, errno, "failed to create test file \"ttt\"");
struct stat64 st1;
if (fstat64 (fd, &st1) != 0)
error (1, errno, "fstat failed");
struct timespec t[2];
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
struct stat64 st2;
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0] = st1.st_atim;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_OMIT;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("atim not set");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim changed from zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_OMIT;
t[1] = st1.st_mtim;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("mtim changed from original time");
status = 1;
}
if (st2.st_mtim.tv_sec != st1.st_mtim.tv_sec
|| st2.st_mtim.tv_nsec != st1.st_mtim.tv_nsec)
{
puts ("mtim not set");
status = 1;
}
if (status != 0)
goto out;
sleep (2);
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_NOW;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_NOW;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
struct timeval tv;
gettimeofday(&tv,NULL);
if (st2.st_atim.tv_sec <= st1.st_atim.tv_sec
|| st2.st_atim.tv_sec > tv.tv_sec)
{
puts ("atim not set to NOW");
status = 1;
}
if (st2.st_mtim.tv_sec <= st1.st_mtim.tv_sec
|| st2.st_mtim.tv_sec > tv.tv_sec)
{
puts ("mtim not set to NOW");
status = 1;
}
if (symlink ("ttt", "tttsym") != 0)
error (1, errno, "cannot create symlink");
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "tttsym", t, AT_SYMLINK_NOFOLLOW) != 0)
error (1, errno, "utimensat failed");
if (lstat64 ("tttsym", &st2) != 0)
error (1, errno, "lstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("symlink atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("symlink mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 1;
t[0].tv_nsec = 0;
t[1].tv_sec = 1;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, fd, NULL, t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 1 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to one");
status = 1;
}
if (st2.st_mtim.tv_sec != 1 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to one");
status = 1;
}
if (status == 0)
puts ("all OK");
out:
close (fd);
unlink ("ttt");
unlink ("tttsym");
return status;
}
[akpm@linux-foundation.org: add missing i386 syscall table entry]
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:33:25 +04:00
return do_utimes ( AT_FDCWD , filename , t ? tv : NULL , 0 ) ;
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE4 ( utimensat , unsigned int , dfd , const char __user * , filename , struct compat_timespec __user * , t , int , flags )
utimensat implementation
Implement utimensat(2) which is an extension to futimesat(2) in that it
a) supports nano-second resolution for the timestamps
b) allows to selectively ignore the atime/mtime value
c) allows to selectively use the current time for either atime or mtime
d) supports changing the atime/mtime of a symlink itself along the lines
of the BSD lutimes(3) functions
For this change the internally used do_utimes() functions was changed to
accept a timespec time value and an additional flags parameter.
Additionally the sys_utime function was changed to match compat_sys_utime
which already use do_utimes instead of duplicating the work.
Also, the completely missing futimensat() functionality is added. We have
such a function in glibc but we have to resort to using /proc/self/fd/* which
not everybody likes (chroot etc).
Test application (the syscall number will need per-arch editing):
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#include <sys/time.h>
#include <stddef.h>
#include <syscall.h>
#define __NR_utimensat 280
#define UTIME_NOW ((1l << 30) - 1l)
#define UTIME_OMIT ((1l << 30) - 2l)
int
main(void)
{
int status = 0;
int fd = open("ttt", O_RDWR|O_CREAT|O_EXCL, 0666);
if (fd == -1)
error (1, errno, "failed to create test file \"ttt\"");
struct stat64 st1;
if (fstat64 (fd, &st1) != 0)
error (1, errno, "fstat failed");
struct timespec t[2];
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
struct stat64 st2;
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0] = st1.st_atim;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_OMIT;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("atim not set");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim changed from zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_OMIT;
t[1] = st1.st_mtim;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("mtim changed from original time");
status = 1;
}
if (st2.st_mtim.tv_sec != st1.st_mtim.tv_sec
|| st2.st_mtim.tv_nsec != st1.st_mtim.tv_nsec)
{
puts ("mtim not set");
status = 1;
}
if (status != 0)
goto out;
sleep (2);
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_NOW;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_NOW;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
struct timeval tv;
gettimeofday(&tv,NULL);
if (st2.st_atim.tv_sec <= st1.st_atim.tv_sec
|| st2.st_atim.tv_sec > tv.tv_sec)
{
puts ("atim not set to NOW");
status = 1;
}
if (st2.st_mtim.tv_sec <= st1.st_mtim.tv_sec
|| st2.st_mtim.tv_sec > tv.tv_sec)
{
puts ("mtim not set to NOW");
status = 1;
}
if (symlink ("ttt", "tttsym") != 0)
error (1, errno, "cannot create symlink");
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "tttsym", t, AT_SYMLINK_NOFOLLOW) != 0)
error (1, errno, "utimensat failed");
if (lstat64 ("tttsym", &st2) != 0)
error (1, errno, "lstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("symlink atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("symlink mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 1;
t[0].tv_nsec = 0;
t[1].tv_sec = 1;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, fd, NULL, t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 1 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to one");
status = 1;
}
if (st2.st_mtim.tv_sec != 1 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to one");
status = 1;
}
if (status == 0)
puts ("all OK");
out:
close (fd);
unlink ("ttt");
unlink ("tttsym");
return status;
}
[akpm@linux-foundation.org: add missing i386 syscall table entry]
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:33:25 +04:00
{
struct timespec tv [ 2 ] ;
if ( t ) {
2014-02-02 06:54:11 +04:00
if ( compat_get_timespec ( & tv [ 0 ] , & t [ 0 ] ) | |
compat_get_timespec ( & tv [ 1 ] , & t [ 1 ] ) )
utimensat implementation
Implement utimensat(2) which is an extension to futimesat(2) in that it
a) supports nano-second resolution for the timestamps
b) allows to selectively ignore the atime/mtime value
c) allows to selectively use the current time for either atime or mtime
d) supports changing the atime/mtime of a symlink itself along the lines
of the BSD lutimes(3) functions
For this change the internally used do_utimes() functions was changed to
accept a timespec time value and an additional flags parameter.
Additionally the sys_utime function was changed to match compat_sys_utime
which already use do_utimes instead of duplicating the work.
Also, the completely missing futimensat() functionality is added. We have
such a function in glibc but we have to resort to using /proc/self/fd/* which
not everybody likes (chroot etc).
Test application (the syscall number will need per-arch editing):
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#include <sys/time.h>
#include <stddef.h>
#include <syscall.h>
#define __NR_utimensat 280
#define UTIME_NOW ((1l << 30) - 1l)
#define UTIME_OMIT ((1l << 30) - 2l)
int
main(void)
{
int status = 0;
int fd = open("ttt", O_RDWR|O_CREAT|O_EXCL, 0666);
if (fd == -1)
error (1, errno, "failed to create test file \"ttt\"");
struct stat64 st1;
if (fstat64 (fd, &st1) != 0)
error (1, errno, "fstat failed");
struct timespec t[2];
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
struct stat64 st2;
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0] = st1.st_atim;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_OMIT;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("atim not set");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim changed from zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_OMIT;
t[1] = st1.st_mtim;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("mtim changed from original time");
status = 1;
}
if (st2.st_mtim.tv_sec != st1.st_mtim.tv_sec
|| st2.st_mtim.tv_nsec != st1.st_mtim.tv_nsec)
{
puts ("mtim not set");
status = 1;
}
if (status != 0)
goto out;
sleep (2);
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_NOW;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_NOW;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
struct timeval tv;
gettimeofday(&tv,NULL);
if (st2.st_atim.tv_sec <= st1.st_atim.tv_sec
|| st2.st_atim.tv_sec > tv.tv_sec)
{
puts ("atim not set to NOW");
status = 1;
}
if (st2.st_mtim.tv_sec <= st1.st_mtim.tv_sec
|| st2.st_mtim.tv_sec > tv.tv_sec)
{
puts ("mtim not set to NOW");
status = 1;
}
if (symlink ("ttt", "tttsym") != 0)
error (1, errno, "cannot create symlink");
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "tttsym", t, AT_SYMLINK_NOFOLLOW) != 0)
error (1, errno, "utimensat failed");
if (lstat64 ("tttsym", &st2) != 0)
error (1, errno, "lstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("symlink atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("symlink mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 1;
t[0].tv_nsec = 0;
t[1].tv_sec = 1;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, fd, NULL, t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 1 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to one");
status = 1;
}
if (st2.st_mtim.tv_sec != 1 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to one");
status = 1;
}
if (status == 0)
puts ("all OK");
out:
close (fd);
unlink ("ttt");
unlink ("tttsym");
return status;
}
[akpm@linux-foundation.org: add missing i386 syscall table entry]
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:33:25 +04:00
return - EFAULT ;
if ( tv [ 0 ] . tv_nsec = = UTIME_OMIT & & tv [ 1 ] . tv_nsec = = UTIME_OMIT )
return 0 ;
}
return do_utimes ( dfd , filename , t ? tv : NULL , flags ) ;
2005-04-17 02:20:36 +04:00
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE3 ( futimesat , unsigned int , dfd , const char __user * , filename , struct compat_timeval __user * , t )
2005-04-17 02:20:36 +04:00
{
utimensat implementation
Implement utimensat(2) which is an extension to futimesat(2) in that it
a) supports nano-second resolution for the timestamps
b) allows to selectively ignore the atime/mtime value
c) allows to selectively use the current time for either atime or mtime
d) supports changing the atime/mtime of a symlink itself along the lines
of the BSD lutimes(3) functions
For this change the internally used do_utimes() functions was changed to
accept a timespec time value and an additional flags parameter.
Additionally the sys_utime function was changed to match compat_sys_utime
which already use do_utimes instead of duplicating the work.
Also, the completely missing futimensat() functionality is added. We have
such a function in glibc but we have to resort to using /proc/self/fd/* which
not everybody likes (chroot etc).
Test application (the syscall number will need per-arch editing):
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#include <sys/time.h>
#include <stddef.h>
#include <syscall.h>
#define __NR_utimensat 280
#define UTIME_NOW ((1l << 30) - 1l)
#define UTIME_OMIT ((1l << 30) - 2l)
int
main(void)
{
int status = 0;
int fd = open("ttt", O_RDWR|O_CREAT|O_EXCL, 0666);
if (fd == -1)
error (1, errno, "failed to create test file \"ttt\"");
struct stat64 st1;
if (fstat64 (fd, &st1) != 0)
error (1, errno, "fstat failed");
struct timespec t[2];
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
struct stat64 st2;
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0] = st1.st_atim;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_OMIT;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("atim not set");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim changed from zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_OMIT;
t[1] = st1.st_mtim;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("mtim changed from original time");
status = 1;
}
if (st2.st_mtim.tv_sec != st1.st_mtim.tv_sec
|| st2.st_mtim.tv_nsec != st1.st_mtim.tv_nsec)
{
puts ("mtim not set");
status = 1;
}
if (status != 0)
goto out;
sleep (2);
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_NOW;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_NOW;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
struct timeval tv;
gettimeofday(&tv,NULL);
if (st2.st_atim.tv_sec <= st1.st_atim.tv_sec
|| st2.st_atim.tv_sec > tv.tv_sec)
{
puts ("atim not set to NOW");
status = 1;
}
if (st2.st_mtim.tv_sec <= st1.st_mtim.tv_sec
|| st2.st_mtim.tv_sec > tv.tv_sec)
{
puts ("mtim not set to NOW");
status = 1;
}
if (symlink ("ttt", "tttsym") != 0)
error (1, errno, "cannot create symlink");
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "tttsym", t, AT_SYMLINK_NOFOLLOW) != 0)
error (1, errno, "utimensat failed");
if (lstat64 ("tttsym", &st2) != 0)
error (1, errno, "lstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("symlink atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("symlink mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 1;
t[0].tv_nsec = 0;
t[1].tv_sec = 1;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, fd, NULL, t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 1 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to one");
status = 1;
}
if (st2.st_mtim.tv_sec != 1 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to one");
status = 1;
}
if (status == 0)
puts ("all OK");
out:
close (fd);
unlink ("ttt");
unlink ("tttsym");
return status;
}
[akpm@linux-foundation.org: add missing i386 syscall table entry]
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:33:25 +04:00
struct timespec tv [ 2 ] ;
2005-04-17 02:20:36 +04:00
2006-02-02 08:11:51 +03:00
if ( t ) {
2005-04-17 02:20:36 +04:00
if ( get_user ( tv [ 0 ] . tv_sec , & t [ 0 ] . tv_sec ) | |
utimensat implementation
Implement utimensat(2) which is an extension to futimesat(2) in that it
a) supports nano-second resolution for the timestamps
b) allows to selectively ignore the atime/mtime value
c) allows to selectively use the current time for either atime or mtime
d) supports changing the atime/mtime of a symlink itself along the lines
of the BSD lutimes(3) functions
For this change the internally used do_utimes() functions was changed to
accept a timespec time value and an additional flags parameter.
Additionally the sys_utime function was changed to match compat_sys_utime
which already use do_utimes instead of duplicating the work.
Also, the completely missing futimensat() functionality is added. We have
such a function in glibc but we have to resort to using /proc/self/fd/* which
not everybody likes (chroot etc).
Test application (the syscall number will need per-arch editing):
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#include <sys/time.h>
#include <stddef.h>
#include <syscall.h>
#define __NR_utimensat 280
#define UTIME_NOW ((1l << 30) - 1l)
#define UTIME_OMIT ((1l << 30) - 2l)
int
main(void)
{
int status = 0;
int fd = open("ttt", O_RDWR|O_CREAT|O_EXCL, 0666);
if (fd == -1)
error (1, errno, "failed to create test file \"ttt\"");
struct stat64 st1;
if (fstat64 (fd, &st1) != 0)
error (1, errno, "fstat failed");
struct timespec t[2];
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
struct stat64 st2;
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0] = st1.st_atim;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_OMIT;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("atim not set");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim changed from zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_OMIT;
t[1] = st1.st_mtim;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("mtim changed from original time");
status = 1;
}
if (st2.st_mtim.tv_sec != st1.st_mtim.tv_sec
|| st2.st_mtim.tv_nsec != st1.st_mtim.tv_nsec)
{
puts ("mtim not set");
status = 1;
}
if (status != 0)
goto out;
sleep (2);
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_NOW;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_NOW;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
struct timeval tv;
gettimeofday(&tv,NULL);
if (st2.st_atim.tv_sec <= st1.st_atim.tv_sec
|| st2.st_atim.tv_sec > tv.tv_sec)
{
puts ("atim not set to NOW");
status = 1;
}
if (st2.st_mtim.tv_sec <= st1.st_mtim.tv_sec
|| st2.st_mtim.tv_sec > tv.tv_sec)
{
puts ("mtim not set to NOW");
status = 1;
}
if (symlink ("ttt", "tttsym") != 0)
error (1, errno, "cannot create symlink");
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "tttsym", t, AT_SYMLINK_NOFOLLOW) != 0)
error (1, errno, "utimensat failed");
if (lstat64 ("tttsym", &st2) != 0)
error (1, errno, "lstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("symlink atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("symlink mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 1;
t[0].tv_nsec = 0;
t[1].tv_sec = 1;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, fd, NULL, t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 1 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to one");
status = 1;
}
if (st2.st_mtim.tv_sec != 1 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to one");
status = 1;
}
if (status == 0)
puts ("all OK");
out:
close (fd);
unlink ("ttt");
unlink ("tttsym");
return status;
}
[akpm@linux-foundation.org: add missing i386 syscall table entry]
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:33:25 +04:00
get_user ( tv [ 0 ] . tv_nsec , & t [ 0 ] . tv_usec ) | |
2005-04-17 02:20:36 +04:00
get_user ( tv [ 1 ] . tv_sec , & t [ 1 ] . tv_sec ) | |
utimensat implementation
Implement utimensat(2) which is an extension to futimesat(2) in that it
a) supports nano-second resolution for the timestamps
b) allows to selectively ignore the atime/mtime value
c) allows to selectively use the current time for either atime or mtime
d) supports changing the atime/mtime of a symlink itself along the lines
of the BSD lutimes(3) functions
For this change the internally used do_utimes() functions was changed to
accept a timespec time value and an additional flags parameter.
Additionally the sys_utime function was changed to match compat_sys_utime
which already use do_utimes instead of duplicating the work.
Also, the completely missing futimensat() functionality is added. We have
such a function in glibc but we have to resort to using /proc/self/fd/* which
not everybody likes (chroot etc).
Test application (the syscall number will need per-arch editing):
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#include <sys/time.h>
#include <stddef.h>
#include <syscall.h>
#define __NR_utimensat 280
#define UTIME_NOW ((1l << 30) - 1l)
#define UTIME_OMIT ((1l << 30) - 2l)
int
main(void)
{
int status = 0;
int fd = open("ttt", O_RDWR|O_CREAT|O_EXCL, 0666);
if (fd == -1)
error (1, errno, "failed to create test file \"ttt\"");
struct stat64 st1;
if (fstat64 (fd, &st1) != 0)
error (1, errno, "fstat failed");
struct timespec t[2];
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
struct stat64 st2;
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0] = st1.st_atim;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_OMIT;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("atim not set");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim changed from zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_OMIT;
t[1] = st1.st_mtim;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("mtim changed from original time");
status = 1;
}
if (st2.st_mtim.tv_sec != st1.st_mtim.tv_sec
|| st2.st_mtim.tv_nsec != st1.st_mtim.tv_nsec)
{
puts ("mtim not set");
status = 1;
}
if (status != 0)
goto out;
sleep (2);
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_NOW;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_NOW;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
struct timeval tv;
gettimeofday(&tv,NULL);
if (st2.st_atim.tv_sec <= st1.st_atim.tv_sec
|| st2.st_atim.tv_sec > tv.tv_sec)
{
puts ("atim not set to NOW");
status = 1;
}
if (st2.st_mtim.tv_sec <= st1.st_mtim.tv_sec
|| st2.st_mtim.tv_sec > tv.tv_sec)
{
puts ("mtim not set to NOW");
status = 1;
}
if (symlink ("ttt", "tttsym") != 0)
error (1, errno, "cannot create symlink");
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "tttsym", t, AT_SYMLINK_NOFOLLOW) != 0)
error (1, errno, "utimensat failed");
if (lstat64 ("tttsym", &st2) != 0)
error (1, errno, "lstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("symlink atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("symlink mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 1;
t[0].tv_nsec = 0;
t[1].tv_sec = 1;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, fd, NULL, t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 1 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to one");
status = 1;
}
if (st2.st_mtim.tv_sec != 1 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to one");
status = 1;
}
if (status == 0)
puts ("all OK");
out:
close (fd);
unlink ("ttt");
unlink ("tttsym");
return status;
}
[akpm@linux-foundation.org: add missing i386 syscall table entry]
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:33:25 +04:00
get_user ( tv [ 1 ] . tv_nsec , & t [ 1 ] . tv_usec ) )
2006-02-02 08:11:51 +03:00
return - EFAULT ;
utimensat implementation
Implement utimensat(2) which is an extension to futimesat(2) in that it
a) supports nano-second resolution for the timestamps
b) allows to selectively ignore the atime/mtime value
c) allows to selectively use the current time for either atime or mtime
d) supports changing the atime/mtime of a symlink itself along the lines
of the BSD lutimes(3) functions
For this change the internally used do_utimes() functions was changed to
accept a timespec time value and an additional flags parameter.
Additionally the sys_utime function was changed to match compat_sys_utime
which already use do_utimes instead of duplicating the work.
Also, the completely missing futimensat() functionality is added. We have
such a function in glibc but we have to resort to using /proc/self/fd/* which
not everybody likes (chroot etc).
Test application (the syscall number will need per-arch editing):
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#include <sys/time.h>
#include <stddef.h>
#include <syscall.h>
#define __NR_utimensat 280
#define UTIME_NOW ((1l << 30) - 1l)
#define UTIME_OMIT ((1l << 30) - 2l)
int
main(void)
{
int status = 0;
int fd = open("ttt", O_RDWR|O_CREAT|O_EXCL, 0666);
if (fd == -1)
error (1, errno, "failed to create test file \"ttt\"");
struct stat64 st1;
if (fstat64 (fd, &st1) != 0)
error (1, errno, "fstat failed");
struct timespec t[2];
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
struct stat64 st2;
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0] = st1.st_atim;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_OMIT;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("atim not set");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim changed from zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_OMIT;
t[1] = st1.st_mtim;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("mtim changed from original time");
status = 1;
}
if (st2.st_mtim.tv_sec != st1.st_mtim.tv_sec
|| st2.st_mtim.tv_nsec != st1.st_mtim.tv_nsec)
{
puts ("mtim not set");
status = 1;
}
if (status != 0)
goto out;
sleep (2);
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_NOW;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_NOW;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
struct timeval tv;
gettimeofday(&tv,NULL);
if (st2.st_atim.tv_sec <= st1.st_atim.tv_sec
|| st2.st_atim.tv_sec > tv.tv_sec)
{
puts ("atim not set to NOW");
status = 1;
}
if (st2.st_mtim.tv_sec <= st1.st_mtim.tv_sec
|| st2.st_mtim.tv_sec > tv.tv_sec)
{
puts ("mtim not set to NOW");
status = 1;
}
if (symlink ("ttt", "tttsym") != 0)
error (1, errno, "cannot create symlink");
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "tttsym", t, AT_SYMLINK_NOFOLLOW) != 0)
error (1, errno, "utimensat failed");
if (lstat64 ("tttsym", &st2) != 0)
error (1, errno, "lstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("symlink atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("symlink mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 1;
t[0].tv_nsec = 0;
t[1].tv_sec = 1;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, fd, NULL, t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 1 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to one");
status = 1;
}
if (st2.st_mtim.tv_sec != 1 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to one");
status = 1;
}
if (status == 0)
puts ("all OK");
out:
close (fd);
unlink ("ttt");
unlink ("tttsym");
return status;
}
[akpm@linux-foundation.org: add missing i386 syscall table entry]
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:33:25 +04:00
if ( tv [ 0 ] . tv_nsec > = 1000000 | | tv [ 0 ] . tv_nsec < 0 | |
tv [ 1 ] . tv_nsec > = 1000000 | | tv [ 1 ] . tv_nsec < 0 )
return - EINVAL ;
tv [ 0 ] . tv_nsec * = 1000 ;
tv [ 1 ] . tv_nsec * = 1000 ;
2006-02-02 08:11:51 +03:00
}
utimensat implementation
Implement utimensat(2) which is an extension to futimesat(2) in that it
a) supports nano-second resolution for the timestamps
b) allows to selectively ignore the atime/mtime value
c) allows to selectively use the current time for either atime or mtime
d) supports changing the atime/mtime of a symlink itself along the lines
of the BSD lutimes(3) functions
For this change the internally used do_utimes() functions was changed to
accept a timespec time value and an additional flags parameter.
Additionally the sys_utime function was changed to match compat_sys_utime
which already use do_utimes instead of duplicating the work.
Also, the completely missing futimensat() functionality is added. We have
such a function in glibc but we have to resort to using /proc/self/fd/* which
not everybody likes (chroot etc).
Test application (the syscall number will need per-arch editing):
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#include <sys/time.h>
#include <stddef.h>
#include <syscall.h>
#define __NR_utimensat 280
#define UTIME_NOW ((1l << 30) - 1l)
#define UTIME_OMIT ((1l << 30) - 2l)
int
main(void)
{
int status = 0;
int fd = open("ttt", O_RDWR|O_CREAT|O_EXCL, 0666);
if (fd == -1)
error (1, errno, "failed to create test file \"ttt\"");
struct stat64 st1;
if (fstat64 (fd, &st1) != 0)
error (1, errno, "fstat failed");
struct timespec t[2];
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
struct stat64 st2;
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0] = st1.st_atim;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_OMIT;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("atim not set");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim changed from zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_OMIT;
t[1] = st1.st_mtim;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != st1.st_atim.tv_sec
|| st2.st_atim.tv_nsec != st1.st_atim.tv_nsec)
{
puts ("mtim changed from original time");
status = 1;
}
if (st2.st_mtim.tv_sec != st1.st_mtim.tv_sec
|| st2.st_mtim.tv_nsec != st1.st_mtim.tv_nsec)
{
puts ("mtim not set");
status = 1;
}
if (status != 0)
goto out;
sleep (2);
t[0].tv_sec = 0;
t[0].tv_nsec = UTIME_NOW;
t[1].tv_sec = 0;
t[1].tv_nsec = UTIME_NOW;
if (syscall(__NR_utimensat, AT_FDCWD, "ttt", t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
struct timeval tv;
gettimeofday(&tv,NULL);
if (st2.st_atim.tv_sec <= st1.st_atim.tv_sec
|| st2.st_atim.tv_sec > tv.tv_sec)
{
puts ("atim not set to NOW");
status = 1;
}
if (st2.st_mtim.tv_sec <= st1.st_mtim.tv_sec
|| st2.st_mtim.tv_sec > tv.tv_sec)
{
puts ("mtim not set to NOW");
status = 1;
}
if (symlink ("ttt", "tttsym") != 0)
error (1, errno, "cannot create symlink");
t[0].tv_sec = 0;
t[0].tv_nsec = 0;
t[1].tv_sec = 0;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, AT_FDCWD, "tttsym", t, AT_SYMLINK_NOFOLLOW) != 0)
error (1, errno, "utimensat failed");
if (lstat64 ("tttsym", &st2) != 0)
error (1, errno, "lstat failed");
if (st2.st_atim.tv_sec != 0 || st2.st_atim.tv_nsec != 0)
{
puts ("symlink atim not reset to zero");
status = 1;
}
if (st2.st_mtim.tv_sec != 0 || st2.st_mtim.tv_nsec != 0)
{
puts ("symlink mtim not reset to zero");
status = 1;
}
if (status != 0)
goto out;
t[0].tv_sec = 1;
t[0].tv_nsec = 0;
t[1].tv_sec = 1;
t[1].tv_nsec = 0;
if (syscall(__NR_utimensat, fd, NULL, t, 0) != 0)
error (1, errno, "utimensat failed");
if (fstat64 (fd, &st2) != 0)
error (1, errno, "fstat failed");
if (st2.st_atim.tv_sec != 1 || st2.st_atim.tv_nsec != 0)
{
puts ("atim not reset to one");
status = 1;
}
if (st2.st_mtim.tv_sec != 1 || st2.st_mtim.tv_nsec != 0)
{
puts ("mtim not reset to one");
status = 1;
}
if (status == 0)
puts ("all OK");
out:
close (fd);
unlink ("ttt");
unlink ("tttsym");
return status;
}
[akpm@linux-foundation.org: add missing i386 syscall table entry]
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:33:25 +04:00
return do_utimes ( dfd , filename , t ? tv : NULL , 0 ) ;
2006-01-19 04:43:53 +03:00
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE2 ( utimes , const char __user * , filename , struct compat_timeval __user * , t )
2006-01-19 04:43:53 +03:00
{
return compat_sys_futimesat ( AT_FDCWD , filename , t ) ;
2005-04-17 02:20:36 +04:00
}
2008-10-16 09:02:05 +04:00
static int cp_compat_stat ( struct kstat * stat , struct compat_stat __user * ubuf )
{
2012-02-13 05:56:29 +04:00
struct compat_stat tmp ;
2008-10-16 09:02:05 +04:00
2012-02-13 05:56:29 +04:00
if ( ! old_valid_dev ( stat - > dev ) | | ! old_valid_dev ( stat - > rdev ) )
return - EOVERFLOW ;
2008-10-16 09:02:05 +04:00
2012-02-13 05:56:29 +04:00
memset ( & tmp , 0 , sizeof ( tmp ) ) ;
tmp . st_dev = old_encode_dev ( stat - > dev ) ;
tmp . st_ino = stat - > ino ;
if ( sizeof ( tmp . st_ino ) < sizeof ( stat - > ino ) & & tmp . st_ino ! = stat - > ino )
2008-10-16 09:02:05 +04:00
return - EOVERFLOW ;
2012-02-13 05:56:29 +04:00
tmp . st_mode = stat - > mode ;
tmp . st_nlink = stat - > nlink ;
if ( tmp . st_nlink ! = stat - > nlink )
2008-10-16 09:02:05 +04:00
return - EOVERFLOW ;
2012-02-09 21:10:30 +04:00
SET_UID ( tmp . st_uid , from_kuid_munged ( current_user_ns ( ) , stat - > uid ) ) ;
SET_GID ( tmp . st_gid , from_kgid_munged ( current_user_ns ( ) , stat - > gid ) ) ;
2012-02-13 05:56:29 +04:00
tmp . st_rdev = old_encode_dev ( stat - > rdev ) ;
if ( ( u64 ) stat - > size > MAX_NON_LFS )
return - EOVERFLOW ;
tmp . st_size = stat - > size ;
tmp . st_atime = stat - > atime . tv_sec ;
tmp . st_atime_nsec = stat - > atime . tv_nsec ;
tmp . st_mtime = stat - > mtime . tv_sec ;
tmp . st_mtime_nsec = stat - > mtime . tv_nsec ;
tmp . st_ctime = stat - > ctime . tv_sec ;
tmp . st_ctime_nsec = stat - > ctime . tv_nsec ;
tmp . st_blocks = stat - > blocks ;
tmp . st_blksize = stat - > blksize ;
return copy_to_user ( ubuf , & tmp , sizeof ( tmp ) ) ? - EFAULT : 0 ;
2008-10-16 09:02:05 +04:00
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE2 ( newstat , const char __user * , filename ,
struct compat_stat __user * , statbuf )
2005-04-17 02:20:36 +04:00
{
struct kstat stat ;
2009-04-09 00:34:03 +04:00
int error ;
2005-04-17 02:20:36 +04:00
2009-04-09 00:34:03 +04:00
error = vfs_stat ( filename , & stat ) ;
if ( error )
return error ;
return cp_compat_stat ( & stat , statbuf ) ;
2005-04-17 02:20:36 +04:00
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE2 ( newlstat , const char __user * , filename ,
struct compat_stat __user * , statbuf )
2005-04-17 02:20:36 +04:00
{
struct kstat stat ;
2009-04-09 00:34:03 +04:00
int error ;
2005-04-17 02:20:36 +04:00
2009-04-09 00:34:03 +04:00
error = vfs_lstat ( filename , & stat ) ;
if ( error )
return error ;
return cp_compat_stat ( & stat , statbuf ) ;
2005-04-17 02:20:36 +04:00
}
2006-03-24 14:18:20 +03:00
# ifndef __ARCH_WANT_STAT64
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE4 ( newfstatat , unsigned int , dfd ,
const char __user * , filename ,
struct compat_stat __user * , statbuf , int , flag )
2006-01-19 04:43:53 +03:00
{
struct kstat stat ;
2009-04-08 20:05:42 +04:00
int error ;
2006-01-19 04:43:53 +03:00
2009-04-08 20:05:42 +04:00
error = vfs_fstatat ( dfd , filename , & stat , flag ) ;
if ( error )
return error ;
return cp_compat_stat ( & stat , statbuf ) ;
2006-01-19 04:43:53 +03:00
}
2006-03-24 14:18:20 +03:00
# endif
2006-01-19 04:43:53 +03:00
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE2 ( newfstat , unsigned int , fd ,
struct compat_stat __user * , statbuf )
2005-04-17 02:20:36 +04:00
{
struct kstat stat ;
int error = vfs_fstat ( fd , & stat ) ;
if ( ! error )
error = cp_compat_stat ( & stat , statbuf ) ;
return error ;
}
static int put_compat_statfs ( struct compat_statfs __user * ubuf , struct kstatfs * kbuf )
{
if ( sizeof ubuf - > f_blocks = = 4 ) {
2008-07-24 08:27:55 +04:00
if ( ( kbuf - > f_blocks | kbuf - > f_bfree | kbuf - > f_bavail |
kbuf - > f_bsize | kbuf - > f_frsize ) & 0xffffffff00000000ULL )
2005-04-17 02:20:36 +04:00
return - EOVERFLOW ;
/* f_files and f_ffree may be -1; it's okay
* to stuff that into 32 bits */
if ( kbuf - > f_files ! = 0xffffffffffffffffULL
& & ( kbuf - > f_files & 0xffffffff00000000ULL ) )
return - EOVERFLOW ;
if ( kbuf - > f_ffree ! = 0xffffffffffffffffULL
& & ( kbuf - > f_ffree & 0xffffffff00000000ULL ) )
return - EOVERFLOW ;
}
if ( ! access_ok ( VERIFY_WRITE , ubuf , sizeof ( * ubuf ) ) | |
__put_user ( kbuf - > f_type , & ubuf - > f_type ) | |
__put_user ( kbuf - > f_bsize , & ubuf - > f_bsize ) | |
__put_user ( kbuf - > f_blocks , & ubuf - > f_blocks ) | |
__put_user ( kbuf - > f_bfree , & ubuf - > f_bfree ) | |
__put_user ( kbuf - > f_bavail , & ubuf - > f_bavail ) | |
__put_user ( kbuf - > f_files , & ubuf - > f_files ) | |
__put_user ( kbuf - > f_ffree , & ubuf - > f_ffree ) | |
__put_user ( kbuf - > f_namelen , & ubuf - > f_namelen ) | |
__put_user ( kbuf - > f_fsid . val [ 0 ] , & ubuf - > f_fsid . val [ 0 ] ) | |
__put_user ( kbuf - > f_fsid . val [ 1 ] , & ubuf - > f_fsid . val [ 1 ] ) | |
__put_user ( kbuf - > f_frsize , & ubuf - > f_frsize ) | |
2011-10-18 00:40:02 +04:00
__put_user ( kbuf - > f_flags , & ubuf - > f_flags ) | |
__clear_user ( ubuf - > f_spare , sizeof ( ubuf - > f_spare ) ) )
2005-04-17 02:20:36 +04:00
return - EFAULT ;
return 0 ;
}
/*
2010-12-26 19:41:53 +03:00
* The following statfs calls are copies of code from fs / statfs . c and
2005-04-17 02:20:36 +04:00
* should be checked against those from time to time
*/
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE2 ( statfs , const char __user * , pathname , struct compat_statfs __user * , buf )
2005-04-17 02:20:36 +04:00
{
2011-03-12 18:41:39 +03:00
struct kstatfs tmp ;
int error = user_statfs ( pathname , & tmp ) ;
if ( ! error )
error = put_compat_statfs ( buf , & tmp ) ;
2005-04-17 02:20:36 +04:00
return error ;
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE2 ( fstatfs , unsigned int , fd , struct compat_statfs __user * , buf )
2005-04-17 02:20:36 +04:00
{
struct kstatfs tmp ;
2011-03-12 18:41:39 +03:00
int error = fd_statfs ( fd , & tmp ) ;
2005-11-22 08:32:23 +03:00
if ( ! error )
error = put_compat_statfs ( buf , & tmp ) ;
2005-04-17 02:20:36 +04:00
return error ;
}
static int put_compat_statfs64 ( struct compat_statfs64 __user * ubuf , struct kstatfs * kbuf )
{
vfs: fix put_compat_statfs64() does not handle errors
put_compat_statfs64() does NOT return -1 and setting errno to EOVERFLOW
when some variables(like: f_bsize) overflowed in the returned struct.
The reason is that the ubuf->f_blocks is __u64 type, it couldn't be
4bits as the judgement in put_comat_statfs64(). Here correct the
__u32 variables(in struct compat_statfs64) for comparison.
reproducer:
step1. mount hugetlbfs with two different pagesize on ppc64 arch.
$ hugeadm --pool-pages-max 16M:0
$ hugeadm --create-mount
$ mount | grep -i hugetlbfs
none on /var/lib/hugetlbfs/pagesize-16MB type hugetlbfs (rw,relatime,seclabel,pagesize=16777216)
none on /var/lib/hugetlbfs/pagesize-16GB type hugetlbfs (rw,relatime,seclabel,pagesize=17179869184)
step2. compile & run this C program.
$ cat statfs64_test.c
#define _LARGEFILE64_SOURCE
#include <stdio.h>
#include <sys/syscall.h>
#include <sys/statfs.h>
int main()
{
struct statfs64 sb;
int err;
err = syscall(SYS_statfs64, "/var/lib/hugetlbfs/pagesize-16GB", sizeof(sb), &sb);
if (err)
return -1;
printf("sizeof f_bsize = %d, f_bsize=%ld\n", sizeof(sb.f_bsize), sb.f_bsize);
return 0;
}
$ gcc -m32 statfs64_test.c
$ ./a.out
sizeof f_bsize = 4, f_bsize=0
Signed-off-by: Li Wang <liwang@redhat.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2016-11-15 12:19:01 +03:00
if ( sizeof ( ubuf - > f_bsize ) = = 4 ) {
if ( ( kbuf - > f_type | kbuf - > f_bsize | kbuf - > f_namelen |
kbuf - > f_frsize | kbuf - > f_flags ) & 0xffffffff00000000ULL )
2005-04-17 02:20:36 +04:00
return - EOVERFLOW ;
/* f_files and f_ffree may be -1; it's okay
* to stuff that into 32 bits */
if ( kbuf - > f_files ! = 0xffffffffffffffffULL
& & ( kbuf - > f_files & 0xffffffff00000000ULL ) )
return - EOVERFLOW ;
if ( kbuf - > f_ffree ! = 0xffffffffffffffffULL
& & ( kbuf - > f_ffree & 0xffffffff00000000ULL ) )
return - EOVERFLOW ;
}
if ( ! access_ok ( VERIFY_WRITE , ubuf , sizeof ( * ubuf ) ) | |
__put_user ( kbuf - > f_type , & ubuf - > f_type ) | |
__put_user ( kbuf - > f_bsize , & ubuf - > f_bsize ) | |
__put_user ( kbuf - > f_blocks , & ubuf - > f_blocks ) | |
__put_user ( kbuf - > f_bfree , & ubuf - > f_bfree ) | |
__put_user ( kbuf - > f_bavail , & ubuf - > f_bavail ) | |
__put_user ( kbuf - > f_files , & ubuf - > f_files ) | |
__put_user ( kbuf - > f_ffree , & ubuf - > f_ffree ) | |
__put_user ( kbuf - > f_namelen , & ubuf - > f_namelen ) | |
__put_user ( kbuf - > f_fsid . val [ 0 ] , & ubuf - > f_fsid . val [ 0 ] ) | |
__put_user ( kbuf - > f_fsid . val [ 1 ] , & ubuf - > f_fsid . val [ 1 ] ) | |
2010-12-26 19:41:54 +03:00
__put_user ( kbuf - > f_frsize , & ubuf - > f_frsize ) | |
__put_user ( kbuf - > f_flags , & ubuf - > f_flags ) | |
__clear_user ( ubuf - > f_spare , sizeof ( ubuf - > f_spare ) ) )
2005-04-17 02:20:36 +04:00
return - EFAULT ;
return 0 ;
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE3 ( statfs64 , const char __user * , pathname , compat_size_t , sz , struct compat_statfs64 __user * , buf )
2005-04-17 02:20:36 +04:00
{
2011-03-12 18:41:39 +03:00
struct kstatfs tmp ;
2005-04-17 02:20:36 +04:00
int error ;
if ( sz ! = sizeof ( * buf ) )
return - EINVAL ;
2011-03-12 18:41:39 +03:00
error = user_statfs ( pathname , & tmp ) ;
if ( ! error )
error = put_compat_statfs64 ( buf , & tmp ) ;
2005-04-17 02:20:36 +04:00
return error ;
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE3 ( fstatfs64 , unsigned int , fd , compat_size_t , sz , struct compat_statfs64 __user * , buf )
2005-04-17 02:20:36 +04:00
{
struct kstatfs tmp ;
int error ;
if ( sz ! = sizeof ( * buf ) )
return - EINVAL ;
2011-03-12 18:41:39 +03:00
error = fd_statfs ( fd , & tmp ) ;
2005-11-22 08:32:23 +03:00
if ( ! error )
error = put_compat_statfs64 ( buf , & tmp ) ;
2005-04-17 02:20:36 +04:00
return error ;
}
2008-11-28 12:09:09 +03:00
/*
* This is a copy of sys_ustat , just dealing with a structure layout .
* Given how simple this syscall is that apporach is more maintainable
* than the various conversion hacks .
*/
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE2 ( ustat , unsigned , dev , struct compat_ustat __user * , u )
2008-11-28 12:09:09 +03:00
{
struct compat_ustat tmp ;
struct kstatfs sbuf ;
2012-01-03 07:28:36 +04:00
int err = vfs_ustat ( new_decode_dev ( dev ) , & sbuf ) ;
2008-11-28 12:09:09 +03:00
if ( err )
return err ;
memset ( & tmp , 0 , sizeof ( struct compat_ustat ) ) ;
tmp . f_tfree = sbuf . f_bfree ;
tmp . f_tinode = sbuf . f_ffree ;
if ( copy_to_user ( u , & tmp , sizeof ( struct compat_ustat ) ) )
return - EFAULT ;
return 0 ;
}
2005-04-17 02:20:36 +04:00
static int get_compat_flock ( struct flock * kfl , struct compat_flock __user * ufl )
{
if ( ! access_ok ( VERIFY_READ , ufl , sizeof ( * ufl ) ) | |
__get_user ( kfl - > l_type , & ufl - > l_type ) | |
__get_user ( kfl - > l_whence , & ufl - > l_whence ) | |
__get_user ( kfl - > l_start , & ufl - > l_start ) | |
__get_user ( kfl - > l_len , & ufl - > l_len ) | |
__get_user ( kfl - > l_pid , & ufl - > l_pid ) )
return - EFAULT ;
return 0 ;
}
static int put_compat_flock ( struct flock * kfl , struct compat_flock __user * ufl )
{
if ( ! access_ok ( VERIFY_WRITE , ufl , sizeof ( * ufl ) ) | |
__put_user ( kfl - > l_type , & ufl - > l_type ) | |
__put_user ( kfl - > l_whence , & ufl - > l_whence ) | |
__put_user ( kfl - > l_start , & ufl - > l_start ) | |
__put_user ( kfl - > l_len , & ufl - > l_len ) | |
__put_user ( kfl - > l_pid , & ufl - > l_pid ) )
return - EFAULT ;
return 0 ;
}
# ifndef HAVE_ARCH_GET_COMPAT_FLOCK64
static int get_compat_flock64 ( struct flock * kfl , struct compat_flock64 __user * ufl )
{
if ( ! access_ok ( VERIFY_READ , ufl , sizeof ( * ufl ) ) | |
__get_user ( kfl - > l_type , & ufl - > l_type ) | |
__get_user ( kfl - > l_whence , & ufl - > l_whence ) | |
__get_user ( kfl - > l_start , & ufl - > l_start ) | |
__get_user ( kfl - > l_len , & ufl - > l_len ) | |
__get_user ( kfl - > l_pid , & ufl - > l_pid ) )
return - EFAULT ;
return 0 ;
}
# endif
# ifndef HAVE_ARCH_PUT_COMPAT_FLOCK64
static int put_compat_flock64 ( struct flock * kfl , struct compat_flock64 __user * ufl )
{
if ( ! access_ok ( VERIFY_WRITE , ufl , sizeof ( * ufl ) ) | |
__put_user ( kfl - > l_type , & ufl - > l_type ) | |
__put_user ( kfl - > l_whence , & ufl - > l_whence ) | |
__put_user ( kfl - > l_start , & ufl - > l_start ) | |
__put_user ( kfl - > l_len , & ufl - > l_len ) | |
__put_user ( kfl - > l_pid , & ufl - > l_pid ) )
return - EFAULT ;
return 0 ;
}
# endif
2014-02-03 21:13:10 +04:00
static unsigned int
convert_fcntl_cmd ( unsigned int cmd )
{
switch ( cmd ) {
case F_GETLK64 :
return F_GETLK ;
case F_SETLK64 :
return F_SETLK ;
case F_SETLKW64 :
return F_SETLKW ;
}
return cmd ;
}
2014-03-04 19:07:52 +04:00
COMPAT_SYSCALL_DEFINE3 ( fcntl64 , unsigned int , fd , unsigned int , cmd ,
compat_ulong_t , arg )
2005-04-17 02:20:36 +04:00
{
mm_segment_t old_fs ;
struct flock f ;
long ret ;
2014-02-03 21:13:10 +04:00
unsigned int conv_cmd ;
2005-04-17 02:20:36 +04:00
switch ( cmd ) {
case F_GETLK :
case F_SETLK :
case F_SETLKW :
ret = get_compat_flock ( & f , compat_ptr ( arg ) ) ;
if ( ret ! = 0 )
break ;
old_fs = get_fs ( ) ;
set_fs ( KERNEL_DS ) ;
ret = sys_fcntl ( fd , cmd , ( unsigned long ) & f ) ;
set_fs ( old_fs ) ;
if ( cmd = = F_GETLK & & ret = = 0 ) {
2009-04-01 13:10:51 +04:00
/* GETLK was successful and we need to return the data...
2006-01-08 12:02:40 +03:00
* but it needs to fit in the compat structure .
* l_start shouldn ' t be too big , unless the original
* start + end is greater than COMPAT_OFF_T_MAX , in which
* case the app was asking for trouble , so we return
* - EOVERFLOW in that case .
* l_len could be too big , in which case we just truncate it ,
* and only allow the app to see that part of the conflicting
* lock that might make sense to it anyway
*/
if ( f . l_start > COMPAT_OFF_T_MAX )
2005-04-17 02:20:36 +04:00
ret = - EOVERFLOW ;
2006-01-08 12:02:40 +03:00
if ( f . l_len > COMPAT_OFF_T_MAX )
f . l_len = COMPAT_OFF_T_MAX ;
2005-04-17 02:20:36 +04:00
if ( ret = = 0 )
ret = put_compat_flock ( & f , compat_ptr ( arg ) ) ;
}
break ;
case F_GETLK64 :
case F_SETLK64 :
case F_SETLKW64 :
2014-04-22 16:23:58 +04:00
case F_OFD_GETLK :
case F_OFD_SETLK :
case F_OFD_SETLKW :
2005-04-17 02:20:36 +04:00
ret = get_compat_flock64 ( & f , compat_ptr ( arg ) ) ;
if ( ret ! = 0 )
break ;
old_fs = get_fs ( ) ;
set_fs ( KERNEL_DS ) ;
2014-02-03 21:13:10 +04:00
conv_cmd = convert_fcntl_cmd ( cmd ) ;
ret = sys_fcntl ( fd , conv_cmd , ( unsigned long ) & f ) ;
2005-04-17 02:20:36 +04:00
set_fs ( old_fs ) ;
2014-04-22 16:23:58 +04:00
if ( ( conv_cmd = = F_GETLK | | conv_cmd = = F_OFD_GETLK ) & & ret = = 0 ) {
2006-01-08 12:02:40 +03:00
/* need to return lock information - see above for commentary */
if ( f . l_start > COMPAT_LOFF_T_MAX )
2005-04-17 02:20:36 +04:00
ret = - EOVERFLOW ;
2006-01-08 12:02:40 +03:00
if ( f . l_len > COMPAT_LOFF_T_MAX )
f . l_len = COMPAT_LOFF_T_MAX ;
2005-04-17 02:20:36 +04:00
if ( ret = = 0 )
ret = put_compat_flock64 ( & f , compat_ptr ( arg ) ) ;
}
break ;
default :
ret = sys_fcntl ( fd , cmd , arg ) ;
break ;
}
return ret ;
}
2014-03-04 19:07:52 +04:00
COMPAT_SYSCALL_DEFINE3 ( fcntl , unsigned int , fd , unsigned int , cmd ,
compat_ulong_t , arg )
2005-04-17 02:20:36 +04:00
{
2014-02-03 21:13:10 +04:00
switch ( cmd ) {
case F_GETLK64 :
case F_SETLK64 :
case F_SETLKW64 :
2014-04-22 16:23:58 +04:00
case F_OFD_GETLK :
case F_OFD_SETLK :
case F_OFD_SETLKW :
2005-04-17 02:20:36 +04:00
return - EINVAL ;
2014-02-03 21:13:10 +04:00
}
2005-04-17 02:20:36 +04:00
return compat_sys_fcntl64 ( fd , cmd , arg ) ;
}
2010-05-27 01:44:25 +04:00
/* A write operation does a read from user space and vice versa */
# define vrfy_dir(type) ((type) == READ ? VERIFY_WRITE : VERIFY_READ)
ssize_t compat_rw_copy_check_uvector ( int type ,
const struct compat_iovec __user * uvector , unsigned long nr_segs ,
unsigned long fast_segs , struct iovec * fast_pointer ,
2012-06-01 03:26:42 +04:00
struct iovec * * ret_pointer )
2010-05-27 01:44:25 +04:00
{
compat_ssize_t tot_len ;
struct iovec * iov = * ret_pointer = fast_pointer ;
ssize_t ret = 0 ;
int seg ;
/*
* SuS says " The readv() function *may* fail if the iovcnt argument
* was less than or equal to 0 , or greater than { IOV_MAX } . Linux has
* traditionally returned zero for zero segments , so . . .
*/
if ( nr_segs = = 0 )
goto out ;
ret = - EINVAL ;
2016-08-22 10:45:59 +03:00
if ( nr_segs > UIO_MAXIOV )
2010-05-27 01:44:25 +04:00
goto out ;
if ( nr_segs > fast_segs ) {
ret = - ENOMEM ;
iov = kmalloc ( nr_segs * sizeof ( struct iovec ) , GFP_KERNEL ) ;
2010-12-26 19:41:52 +03:00
if ( iov = = NULL )
2010-05-27 01:44:25 +04:00
goto out ;
}
* ret_pointer = iov ;
Fix: compat_rw_copy_check_uvector() misuse in aio, readv, writev, and security keys
Looking at mm/process_vm_access.c:process_vm_rw() and comparing it to
compat_process_vm_rw() shows that the compatibility code requires an
explicit "access_ok()" check before calling
compat_rw_copy_check_uvector(). The same difference seems to appear when
we compare fs/read_write.c:do_readv_writev() to
fs/compat.c:compat_do_readv_writev().
This subtle difference between the compat and non-compat requirements
should probably be debated, as it seems to be error-prone. In fact,
there are two others sites that use this function in the Linux kernel,
and they both seem to get it wrong:
Now shifting our attention to fs/aio.c, we see that aio_setup_iocb()
also ends up calling compat_rw_copy_check_uvector() through
aio_setup_vectored_rw(). Unfortunately, the access_ok() check appears to
be missing. Same situation for
security/keys/compat.c:compat_keyctl_instantiate_key_iov().
I propose that we add the access_ok() check directly into
compat_rw_copy_check_uvector(), so callers don't have to worry about it,
and it therefore makes the compat call code similar to its non-compat
counterpart. Place the access_ok() check in the same location where
copy_from_user() can trigger a -EFAULT error in the non-compat code, so
the ABI behaviors are alike on both compat and non-compat.
While we are here, fix compat_do_readv_writev() so it checks for
compat_rw_copy_check_uvector() negative return values.
And also, fix a memory leak in compat_keyctl_instantiate_key_iov() error
handling.
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-25 19:20:36 +04:00
ret = - EFAULT ;
if ( ! access_ok ( VERIFY_READ , uvector , nr_segs * sizeof ( * uvector ) ) )
goto out ;
2010-05-27 01:44:25 +04:00
/*
* Single unix specification :
* We should - EINVAL if an element length is not > = 0 and fitting an
2010-10-29 21:36:49 +04:00
* ssize_t .
2010-05-27 01:44:25 +04:00
*
2010-10-29 21:36:49 +04:00
* In Linux , the total length is limited to MAX_RW_COUNT , there is
* no overflow possibility .
2010-05-27 01:44:25 +04:00
*/
tot_len = 0 ;
ret = - EINVAL ;
for ( seg = 0 ; seg < nr_segs ; seg + + ) {
compat_uptr_t buf ;
compat_ssize_t len ;
if ( __get_user ( len , & uvector - > iov_len ) | |
__get_user ( buf , & uvector - > iov_base ) ) {
ret = - EFAULT ;
goto out ;
}
if ( len < 0 ) /* size_t not fitting in compat_ssize_t .. */
goto out ;
2012-06-01 03:26:42 +04:00
if ( type > = 0 & &
2011-11-01 04:06:39 +04:00
! access_ok ( vrfy_dir ( type ) , compat_ptr ( buf ) , len ) ) {
2010-05-27 01:44:25 +04:00
ret = - EFAULT ;
goto out ;
}
2010-10-29 21:36:49 +04:00
if ( len > MAX_RW_COUNT - tot_len )
len = MAX_RW_COUNT - tot_len ;
tot_len + = len ;
2010-05-27 01:44:25 +04:00
iov - > iov_base = compat_ptr ( buf ) ;
iov - > iov_len = ( compat_size_t ) len ;
uvector + + ;
iov + + ;
}
ret = tot_len ;
out :
return ret ;
}
2005-04-17 02:20:36 +04:00
struct compat_ncp_mount_data {
compat_int_t version ;
compat_uint_t ncp_fd ;
2005-09-07 02:16:40 +04:00
__compat_uid_t mounted_uid ;
2005-04-17 02:20:36 +04:00
compat_pid_t wdog_pid ;
unsigned char mounted_vol [ NCP_VOLNAME_LEN + 1 ] ;
compat_uint_t time_out ;
compat_uint_t retry_count ;
compat_uint_t flags ;
2005-09-07 02:16:40 +04:00
__compat_uid_t uid ;
__compat_gid_t gid ;
2005-04-17 02:20:36 +04:00
compat_mode_t file_mode ;
compat_mode_t dir_mode ;
} ;
struct compat_ncp_mount_data_v4 {
compat_int_t version ;
compat_ulong_t flags ;
compat_ulong_t mounted_uid ;
compat_long_t wdog_pid ;
compat_uint_t ncp_fd ;
compat_uint_t time_out ;
compat_uint_t retry_count ;
compat_ulong_t uid ;
compat_ulong_t gid ;
compat_ulong_t file_mode ;
compat_ulong_t dir_mode ;
} ;
static void * do_ncp_super_data_conv ( void * raw_data )
{
int version = * ( unsigned int * ) raw_data ;
if ( version = = 3 ) {
struct compat_ncp_mount_data * c_n = raw_data ;
struct ncp_mount_data * n = raw_data ;
n - > dir_mode = c_n - > dir_mode ;
n - > file_mode = c_n - > file_mode ;
n - > gid = c_n - > gid ;
n - > uid = c_n - > uid ;
memmove ( n - > mounted_vol , c_n - > mounted_vol , ( sizeof ( c_n - > mounted_vol ) + 3 * sizeof ( unsigned int ) ) ) ;
n - > wdog_pid = c_n - > wdog_pid ;
n - > mounted_uid = c_n - > mounted_uid ;
} else if ( version = = 4 ) {
struct compat_ncp_mount_data_v4 * c_n = raw_data ;
struct ncp_mount_data_v4 * n = raw_data ;
n - > dir_mode = c_n - > dir_mode ;
n - > file_mode = c_n - > file_mode ;
n - > gid = c_n - > gid ;
n - > uid = c_n - > uid ;
n - > retry_count = c_n - > retry_count ;
n - > time_out = c_n - > time_out ;
n - > ncp_fd = c_n - > ncp_fd ;
n - > wdog_pid = c_n - > wdog_pid ;
n - > mounted_uid = c_n - > mounted_uid ;
n - > flags = c_n - > flags ;
} else if ( version ! = 5 ) {
return NULL ;
}
return raw_data ;
}
2005-04-18 21:54:51 +04:00
struct compat_nfs_string {
compat_uint_t len ;
2005-04-28 02:39:03 +04:00
compat_uptr_t data ;
2005-04-18 21:54:51 +04:00
} ;
static inline void compat_nfs_string ( struct nfs_string * dst ,
struct compat_nfs_string * src )
{
dst - > data = compat_ptr ( src - > data ) ;
dst - > len = src - > len ;
}
struct compat_nfs4_mount_data_v1 {
compat_int_t version ;
compat_int_t flags ;
compat_int_t rsize ;
compat_int_t wsize ;
compat_int_t timeo ;
compat_int_t retrans ;
compat_int_t acregmin ;
compat_int_t acregmax ;
compat_int_t acdirmin ;
compat_int_t acdirmax ;
struct compat_nfs_string client_addr ;
struct compat_nfs_string mnt_path ;
struct compat_nfs_string hostname ;
compat_uint_t host_addrlen ;
2005-04-28 02:39:03 +04:00
compat_uptr_t host_addr ;
2005-04-18 21:54:51 +04:00
compat_int_t proto ;
compat_int_t auth_flavourlen ;
2005-04-28 02:39:03 +04:00
compat_uptr_t auth_flavours ;
2005-04-18 21:54:51 +04:00
} ;
static int do_nfs4_super_data_conv ( void * raw_data )
{
int version = * ( compat_uint_t * ) raw_data ;
if ( version = = 1 ) {
struct compat_nfs4_mount_data_v1 * raw = raw_data ;
struct nfs4_mount_data * real = raw_data ;
/* copy the fields backwards */
real - > auth_flavours = compat_ptr ( raw - > auth_flavours ) ;
real - > auth_flavourlen = raw - > auth_flavourlen ;
real - > proto = raw - > proto ;
real - > host_addr = compat_ptr ( raw - > host_addr ) ;
real - > host_addrlen = raw - > host_addrlen ;
compat_nfs_string ( & real - > hostname , & raw - > hostname ) ;
compat_nfs_string ( & real - > mnt_path , & raw - > mnt_path ) ;
compat_nfs_string ( & real - > client_addr , & raw - > client_addr ) ;
real - > acdirmax = raw - > acdirmax ;
real - > acdirmin = raw - > acdirmin ;
real - > acregmax = raw - > acregmax ;
real - > acregmin = raw - > acregmin ;
real - > retrans = raw - > retrans ;
real - > timeo = raw - > timeo ;
real - > wsize = raw - > wsize ;
real - > rsize = raw - > rsize ;
real - > flags = raw - > flags ;
real - > version = raw - > version ;
}
return 0 ;
}
2005-04-17 02:20:36 +04:00
# define NCPFS_NAME "ncpfs"
2005-04-18 21:54:51 +04:00
# define NFS4_NAME "nfs4"
2005-04-17 02:20:36 +04:00
2014-03-04 19:07:52 +04:00
COMPAT_SYSCALL_DEFINE5 ( mount , const char __user * , dev_name ,
const char __user * , dir_name ,
const char __user * , type , compat_ulong_t , flags ,
const void __user * , data )
2005-04-17 02:20:36 +04:00
{
fs: fix overflow in sys_mount() for in-kernel calls
sys_mount() reads/copies a whole page for its "type" parameter. When
do_mount_root() passes a kernel address that points to an object which is
smaller than a whole page, copy_mount_options() will happily go past this
memory object, possibly dereferencing "wild" pointers that could be in any
state (hence the kmemcheck warning, which shows that parts of the next
page are not even allocated).
(The likelihood of something going wrong here is pretty low -- first of
all this only applies to kernel calls to sys_mount(), which are mostly
found in the boot code. Secondly, I guess if the page was not mapped,
exact_copy_from_user() _would_ in fact handle it correctly because of its
access_ok(), etc. checks.)
But it is much nicer to avoid the dubious reads altogether, by stopping as
soon as we find a NUL byte. Is there a good reason why we can't do
something like this, using the already existing strndup_from_user()?
[akpm@linux-foundation.org: make copy_mount_string() static]
[AV: fix compat mount breakage, which involves undoing akpm's change above]
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: al <al@dizzy.pdmi.ras.ru>
2009-09-19 00:05:45 +04:00
char * kernel_type ;
2015-12-15 02:44:44 +03:00
void * options ;
fs: fix overflow in sys_mount() for in-kernel calls
sys_mount() reads/copies a whole page for its "type" parameter. When
do_mount_root() passes a kernel address that points to an object which is
smaller than a whole page, copy_mount_options() will happily go past this
memory object, possibly dereferencing "wild" pointers that could be in any
state (hence the kmemcheck warning, which shows that parts of the next
page are not even allocated).
(The likelihood of something going wrong here is pretty low -- first of
all this only applies to kernel calls to sys_mount(), which are mostly
found in the boot code. Secondly, I guess if the page was not mapped,
exact_copy_from_user() _would_ in fact handle it correctly because of its
access_ok(), etc. checks.)
But it is much nicer to avoid the dubious reads altogether, by stopping as
soon as we find a NUL byte. Is there a good reason why we can't do
something like this, using the already existing strndup_from_user()?
[akpm@linux-foundation.org: make copy_mount_string() static]
[AV: fix compat mount breakage, which involves undoing akpm's change above]
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: al <al@dizzy.pdmi.ras.ru>
2009-09-19 00:05:45 +04:00
char * kernel_dev ;
2005-04-17 02:20:36 +04:00
int retval ;
2014-08-28 21:26:03 +04:00
kernel_type = copy_mount_string ( type ) ;
retval = PTR_ERR ( kernel_type ) ;
if ( IS_ERR ( kernel_type ) )
2005-04-17 02:20:36 +04:00
goto out ;
2014-08-28 21:26:03 +04:00
kernel_dev = copy_mount_string ( dev_name ) ;
retval = PTR_ERR ( kernel_dev ) ;
if ( IS_ERR ( kernel_dev ) )
2014-09-14 17:15:10 +04:00
goto out1 ;
2005-04-17 02:20:36 +04:00
2015-12-15 02:44:44 +03:00
options = copy_mount_options ( data ) ;
retval = PTR_ERR ( options ) ;
if ( IS_ERR ( options ) )
2014-09-14 17:15:10 +04:00
goto out2 ;
2005-04-17 02:20:36 +04:00
2015-12-15 02:44:44 +03:00
if ( kernel_type & & options ) {
2010-10-05 00:55:57 +04:00
if ( ! strcmp ( kernel_type , NCPFS_NAME ) ) {
2015-12-15 02:44:44 +03:00
do_ncp_super_data_conv ( options ) ;
fs: fix overflow in sys_mount() for in-kernel calls
sys_mount() reads/copies a whole page for its "type" parameter. When
do_mount_root() passes a kernel address that points to an object which is
smaller than a whole page, copy_mount_options() will happily go past this
memory object, possibly dereferencing "wild" pointers that could be in any
state (hence the kmemcheck warning, which shows that parts of the next
page are not even allocated).
(The likelihood of something going wrong here is pretty low -- first of
all this only applies to kernel calls to sys_mount(), which are mostly
found in the boot code. Secondly, I guess if the page was not mapped,
exact_copy_from_user() _would_ in fact handle it correctly because of its
access_ok(), etc. checks.)
But it is much nicer to avoid the dubious reads altogether, by stopping as
soon as we find a NUL byte. Is there a good reason why we can't do
something like this, using the already existing strndup_from_user()?
[akpm@linux-foundation.org: make copy_mount_string() static]
[AV: fix compat mount breakage, which involves undoing akpm's change above]
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: al <al@dizzy.pdmi.ras.ru>
2009-09-19 00:05:45 +04:00
} else if ( ! strcmp ( kernel_type , NFS4_NAME ) ) {
2015-12-15 02:44:44 +03:00
retval = - EINVAL ;
if ( do_nfs4_super_data_conv ( options ) )
2014-09-14 17:15:10 +04:00
goto out3 ;
2005-04-17 02:20:36 +04:00
}
}
2015-12-15 02:44:44 +03:00
retval = do_mount ( kernel_dev , dir_name , kernel_type , flags , options ) ;
2005-04-17 02:20:36 +04:00
out3 :
2015-12-15 02:44:44 +03:00
kfree ( options ) ;
2005-04-17 02:20:36 +04:00
out2 :
2014-09-14 17:15:10 +04:00
kfree ( kernel_dev ) ;
2005-04-17 02:20:36 +04:00
out1 :
fs: fix overflow in sys_mount() for in-kernel calls
sys_mount() reads/copies a whole page for its "type" parameter. When
do_mount_root() passes a kernel address that points to an object which is
smaller than a whole page, copy_mount_options() will happily go past this
memory object, possibly dereferencing "wild" pointers that could be in any
state (hence the kmemcheck warning, which shows that parts of the next
page are not even allocated).
(The likelihood of something going wrong here is pretty low -- first of
all this only applies to kernel calls to sys_mount(), which are mostly
found in the boot code. Secondly, I guess if the page was not mapped,
exact_copy_from_user() _would_ in fact handle it correctly because of its
access_ok(), etc. checks.)
But it is much nicer to avoid the dubious reads altogether, by stopping as
soon as we find a NUL byte. Is there a good reason why we can't do
something like this, using the already existing strndup_from_user()?
[akpm@linux-foundation.org: make copy_mount_string() static]
[AV: fix compat mount breakage, which involves undoing akpm's change above]
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: al <al@dizzy.pdmi.ras.ru>
2009-09-19 00:05:45 +04:00
kfree ( kernel_type ) ;
2005-04-17 02:20:36 +04:00
out :
return retval ;
}
struct compat_old_linux_dirent {
compat_ulong_t d_ino ;
compat_ulong_t d_offset ;
unsigned short d_namlen ;
char d_name [ 1 ] ;
} ;
struct compat_readdir_callback {
2013-05-15 21:52:59 +04:00
struct dir_context ctx ;
2005-04-17 02:20:36 +04:00
struct compat_old_linux_dirent __user * dirent ;
int result ;
} ;
2014-10-30 19:37:34 +03:00
static int compat_fillonedir ( struct dir_context * ctx , const char * name ,
int namlen , loff_t offset , u64 ino ,
unsigned int d_type )
2005-04-17 02:20:36 +04:00
{
2014-10-30 19:37:34 +03:00
struct compat_readdir_callback * buf =
container_of ( ctx , struct compat_readdir_callback , ctx ) ;
2005-04-17 02:20:36 +04:00
struct compat_old_linux_dirent __user * dirent ;
2006-10-03 12:13:46 +04:00
compat_ulong_t d_ino ;
2005-04-17 02:20:36 +04:00
if ( buf - > result )
return - EINVAL ;
2006-10-03 12:13:46 +04:00
d_ino = ino ;
2008-08-12 08:28:24 +04:00
if ( sizeof ( d_ino ) < sizeof ( ino ) & & d_ino ! = ino ) {
buf - > result = - EOVERFLOW ;
2006-10-03 12:13:46 +04:00
return - EOVERFLOW ;
2008-08-12 08:28:24 +04:00
}
2005-04-17 02:20:36 +04:00
buf - > result + + ;
dirent = buf - > dirent ;
if ( ! access_ok ( VERIFY_WRITE , dirent ,
( unsigned long ) ( dirent - > d_name + namlen + 1 ) -
( unsigned long ) dirent ) )
goto efault ;
2006-10-03 12:13:46 +04:00
if ( __put_user ( d_ino , & dirent - > d_ino ) | |
2005-04-17 02:20:36 +04:00
__put_user ( offset , & dirent - > d_offset ) | |
__put_user ( namlen , & dirent - > d_namlen ) | |
__copy_to_user ( dirent - > d_name , name , namlen ) | |
__put_user ( 0 , dirent - > d_name + namlen ) )
goto efault ;
return 0 ;
efault :
buf - > result = - EFAULT ;
return - EFAULT ;
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE3 ( old_readdir , unsigned int , fd ,
struct compat_old_linux_dirent __user * , dirent , unsigned int , count )
2005-04-17 02:20:36 +04:00
{
int error ;
2016-04-21 00:08:21 +03:00
struct fd f = fdget_pos ( fd ) ;
2013-05-23 06:22:04 +04:00
struct compat_readdir_callback buf = {
. ctx . actor = compat_fillonedir ,
. dirent = dirent
} ;
2005-04-17 02:20:36 +04:00
2012-08-28 20:52:22 +04:00
if ( ! f . file )
2012-04-22 02:40:32 +04:00
return - EBADF ;
2005-04-17 02:20:36 +04:00
2013-05-15 21:52:59 +04:00
error = iterate_dir ( f . file , & buf . ctx ) ;
2008-08-24 15:29:52 +04:00
if ( buf . result )
2005-04-17 02:20:36 +04:00
error = buf . result ;
2016-04-21 00:08:21 +03:00
fdput_pos ( f ) ;
2005-04-17 02:20:36 +04:00
return error ;
}
struct compat_linux_dirent {
compat_ulong_t d_ino ;
compat_ulong_t d_off ;
unsigned short d_reclen ;
char d_name [ 1 ] ;
} ;
struct compat_getdents_callback {
2013-05-15 21:52:59 +04:00
struct dir_context ctx ;
2005-04-17 02:20:36 +04:00
struct compat_linux_dirent __user * current_dir ;
struct compat_linux_dirent __user * previous ;
int count ;
int error ;
} ;
2014-10-30 19:37:34 +03:00
static int compat_filldir ( struct dir_context * ctx , const char * name , int namlen ,
2006-10-03 12:13:46 +04:00
loff_t offset , u64 ino , unsigned int d_type )
2005-04-17 02:20:36 +04:00
{
struct compat_linux_dirent __user * dirent ;
2014-10-30 19:37:34 +03:00
struct compat_getdents_callback * buf =
container_of ( ctx , struct compat_getdents_callback , ctx ) ;
2006-10-03 12:13:46 +04:00
compat_ulong_t d_ino ;
2010-08-10 04:20:22 +04:00
int reclen = ALIGN ( offsetof ( struct compat_linux_dirent , d_name ) +
namlen + 2 , sizeof ( compat_long_t ) ) ;
2005-04-17 02:20:36 +04:00
buf - > error = - EINVAL ; /* only used if we fail.. */
if ( reclen > buf - > count )
return - EINVAL ;
2006-10-03 12:13:46 +04:00
d_ino = ino ;
2008-08-12 08:28:24 +04:00
if ( sizeof ( d_ino ) < sizeof ( ino ) & & d_ino ! = ino ) {
buf - > error = - EOVERFLOW ;
2006-10-03 12:13:46 +04:00
return - EOVERFLOW ;
2008-08-12 08:28:24 +04:00
}
2005-04-17 02:20:36 +04:00
dirent = buf - > previous ;
if ( dirent ) {
2016-04-24 05:50:07 +03:00
if ( signal_pending ( current ) )
return - EINTR ;
2005-04-17 02:20:36 +04:00
if ( __put_user ( offset , & dirent - > d_off ) )
goto efault ;
}
dirent = buf - > current_dir ;
2006-10-03 12:13:46 +04:00
if ( __put_user ( d_ino , & dirent - > d_ino ) )
2005-04-17 02:20:36 +04:00
goto efault ;
if ( __put_user ( reclen , & dirent - > d_reclen ) )
goto efault ;
if ( copy_to_user ( dirent - > d_name , name , namlen ) )
goto efault ;
if ( __put_user ( 0 , dirent - > d_name + namlen ) )
goto efault ;
if ( __put_user ( d_type , ( char __user * ) dirent + reclen - 1 ) )
goto efault ;
buf - > previous = dirent ;
dirent = ( void __user * ) dirent + reclen ;
buf - > current_dir = dirent ;
buf - > count - = reclen ;
return 0 ;
efault :
buf - > error = - EFAULT ;
return - EFAULT ;
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE3 ( getdents , unsigned int , fd ,
struct compat_linux_dirent __user * , dirent , unsigned int , count )
2005-04-17 02:20:36 +04:00
{
2012-08-28 20:52:22 +04:00
struct fd f ;
2005-04-17 02:20:36 +04:00
struct compat_linux_dirent __user * lastdirent ;
2013-05-23 06:22:04 +04:00
struct compat_getdents_callback buf = {
. ctx . actor = compat_filldir ,
. current_dir = dirent ,
. count = count
} ;
2005-04-17 02:20:36 +04:00
int error ;
if ( ! access_ok ( VERIFY_WRITE , dirent , count ) )
2012-04-22 02:40:32 +04:00
return - EFAULT ;
2005-04-17 02:20:36 +04:00
2016-04-21 00:08:21 +03:00
f = fdget_pos ( fd ) ;
2012-08-28 20:52:22 +04:00
if ( ! f . file )
2012-04-22 02:40:32 +04:00
return - EBADF ;
2005-04-17 02:20:36 +04:00
2013-05-15 21:52:59 +04:00
error = iterate_dir ( f . file , & buf . ctx ) ;
2008-08-24 15:29:52 +04:00
if ( error > = 0 )
error = buf . error ;
2005-04-17 02:20:36 +04:00
lastdirent = buf . previous ;
if ( lastdirent ) {
2013-05-16 02:49:12 +04:00
if ( put_user ( buf . ctx . pos , & lastdirent - > d_off ) )
2005-04-17 02:20:36 +04:00
error = - EFAULT ;
else
error = count - buf . count ;
}
2016-04-21 00:08:21 +03:00
fdput_pos ( f ) ;
2005-04-17 02:20:36 +04:00
return error ;
}
2014-03-03 13:44:03 +04:00
# ifdef __ARCH_WANT_COMPAT_SYS_GETDENTS64
2005-04-17 02:20:36 +04:00
struct compat_getdents_callback64 {
2013-05-15 21:52:59 +04:00
struct dir_context ctx ;
2005-04-17 02:20:36 +04:00
struct linux_dirent64 __user * current_dir ;
struct linux_dirent64 __user * previous ;
int count ;
int error ;
} ;
2014-10-30 19:37:34 +03:00
static int compat_filldir64 ( struct dir_context * ctx , const char * name ,
int namlen , loff_t offset , u64 ino ,
unsigned int d_type )
2005-04-17 02:20:36 +04:00
{
struct linux_dirent64 __user * dirent ;
2014-10-30 19:37:34 +03:00
struct compat_getdents_callback64 * buf =
container_of ( ctx , struct compat_getdents_callback64 , ctx ) ;
2010-08-10 04:20:22 +04:00
int reclen = ALIGN ( offsetof ( struct linux_dirent64 , d_name ) + namlen + 1 ,
sizeof ( u64 ) ) ;
2005-04-17 02:20:36 +04:00
u64 off ;
buf - > error = - EINVAL ; /* only used if we fail.. */
if ( reclen > buf - > count )
return - EINVAL ;
dirent = buf - > previous ;
if ( dirent ) {
2016-04-24 05:50:07 +03:00
if ( signal_pending ( current ) )
return - EINTR ;
2005-04-17 02:20:36 +04:00
if ( __put_user_unaligned ( offset , & dirent - > d_off ) )
goto efault ;
}
dirent = buf - > current_dir ;
if ( __put_user_unaligned ( ino , & dirent - > d_ino ) )
goto efault ;
off = 0 ;
if ( __put_user_unaligned ( off , & dirent - > d_off ) )
goto efault ;
if ( __put_user ( reclen , & dirent - > d_reclen ) )
goto efault ;
if ( __put_user ( d_type , & dirent - > d_type ) )
goto efault ;
if ( copy_to_user ( dirent - > d_name , name , namlen ) )
goto efault ;
if ( __put_user ( 0 , dirent - > d_name + namlen ) )
goto efault ;
buf - > previous = dirent ;
dirent = ( void __user * ) dirent + reclen ;
buf - > current_dir = dirent ;
buf - > count - = reclen ;
return 0 ;
efault :
buf - > error = - EFAULT ;
return - EFAULT ;
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE3 ( getdents64 , unsigned int , fd ,
struct linux_dirent64 __user * , dirent , unsigned int , count )
2005-04-17 02:20:36 +04:00
{
2012-08-28 20:52:22 +04:00
struct fd f ;
2005-04-17 02:20:36 +04:00
struct linux_dirent64 __user * lastdirent ;
2013-05-23 06:22:04 +04:00
struct compat_getdents_callback64 buf = {
. ctx . actor = compat_filldir64 ,
. current_dir = dirent ,
. count = count
} ;
2005-04-17 02:20:36 +04:00
int error ;
if ( ! access_ok ( VERIFY_WRITE , dirent , count ) )
2012-04-22 02:40:32 +04:00
return - EFAULT ;
2005-04-17 02:20:36 +04:00
2016-04-21 00:08:21 +03:00
f = fdget_pos ( fd ) ;
2012-08-28 20:52:22 +04:00
if ( ! f . file )
2012-04-22 02:40:32 +04:00
return - EBADF ;
2005-04-17 02:20:36 +04:00
2013-05-15 21:52:59 +04:00
error = iterate_dir ( f . file , & buf . ctx ) ;
2008-08-24 15:29:52 +04:00
if ( error > = 0 )
error = buf . error ;
2005-04-17 02:20:36 +04:00
lastdirent = buf . previous ;
if ( lastdirent ) {
2013-05-16 02:49:12 +04:00
typeof ( lastdirent - > d_off ) d_off = buf . ctx . pos ;
2006-12-07 07:36:36 +03:00
if ( __put_user_unaligned ( d_off , & lastdirent - > d_off ) )
2008-08-24 15:29:52 +04:00
error = - EFAULT ;
else
error = count - buf . count ;
2005-04-17 02:20:36 +04:00
}
2016-04-21 00:08:21 +03:00
fdput_pos ( f ) ;
2005-04-17 02:20:36 +04:00
return error ;
}
2014-03-03 13:44:03 +04:00
# endif /* __ARCH_WANT_COMPAT_SYS_GETDENTS64 */
2005-04-17 02:20:36 +04:00
2005-09-07 02:18:25 +04:00
/*
* Exactly like fs / open . c : sys_open ( ) , except that it doesn ' t set the
* O_LARGEFILE flag .
*/
2012-12-26 05:24:38 +04:00
COMPAT_SYSCALL_DEFINE3 ( open , const char __user * , filename , int , flags , umode_t , mode )
2005-09-07 02:18:25 +04:00
{
2006-01-19 04:43:53 +03:00
return do_sys_open ( AT_FDCWD , filename , flags , mode ) ;
}
/*
* Exactly like fs / open . c : sys_openat ( ) , except that it doesn ' t set the
* O_LARGEFILE flag .
*/
2012-12-26 05:24:38 +04:00
COMPAT_SYSCALL_DEFINE4 ( openat , int , dfd , const char __user * , filename , int , flags , umode_t , mode )
2006-01-19 04:43:53 +03:00
{
return do_sys_open ( dfd , filename , flags , mode ) ;
2005-09-07 02:18:25 +04:00
}
2005-04-17 02:20:36 +04:00
# define __COMPAT_NFDBITS (8 * sizeof(compat_ulong_t))
2008-08-31 19:16:57 +04:00
static int poll_select_copy_remaining ( struct timespec * end_time , void __user * p ,
int timeval , int ret )
{
struct timespec ts ;
if ( ! p )
return ret ;
if ( current - > personality & STICKY_TIMEOUTS )
goto sticky ;
/* No update for zero timeout */
if ( ! end_time - > tv_sec & & ! end_time - > tv_nsec )
return ret ;
ktime_get_ts ( & ts ) ;
ts = timespec_sub ( * end_time , ts ) ;
if ( ts . tv_sec < 0 )
ts . tv_sec = ts . tv_nsec = 0 ;
if ( timeval ) {
struct compat_timeval rtv ;
rtv . tv_sec = ts . tv_sec ;
rtv . tv_usec = ts . tv_nsec / NSEC_PER_USEC ;
if ( ! copy_to_user ( p , & rtv , sizeof ( rtv ) ) )
return ret ;
} else {
struct compat_timespec rts ;
rts . tv_sec = ts . tv_sec ;
rts . tv_nsec = ts . tv_nsec ;
if ( ! copy_to_user ( p , & rts , sizeof ( rts ) ) )
return ret ;
}
/*
* If an application puts its timeval in read - only memory , we
* don ' t want the Linux - specific update to the timeval to
* cause a fault after the select has completed
* successfully . However , because we ' re not updating the
* timeval , we can ' t restart the system call .
*/
sticky :
if ( ret = = - ERESTARTNOHAND )
ret = - EINTR ;
return ret ;
}
2005-04-17 02:20:36 +04:00
/*
* Ooo , nasty . We need here to frob 32 - bit unsigned longs to
* 64 - bit unsigned longs .
*/
2006-01-15 00:20:43 +03:00
static
2005-04-17 02:20:36 +04:00
int compat_get_fd_set ( unsigned long nr , compat_ulong_t __user * ufdset ,
unsigned long * fdset )
{
2007-05-08 11:29:02 +04:00
nr = DIV_ROUND_UP ( nr , __COMPAT_NFDBITS ) ;
2005-04-17 02:20:36 +04:00
if ( ufdset ) {
unsigned long odd ;
if ( ! access_ok ( VERIFY_WRITE , ufdset , nr * sizeof ( compat_ulong_t ) ) )
return - EFAULT ;
odd = nr & 1UL ;
nr & = ~ 1UL ;
while ( nr ) {
unsigned long h , l ;
2006-12-07 07:36:36 +03:00
if ( __get_user ( l , ufdset ) | | __get_user ( h , ufdset + 1 ) )
return - EFAULT ;
2005-04-17 02:20:36 +04:00
ufdset + = 2 ;
* fdset + + = h < < 32 | l ;
nr - = 2 ;
}
2006-12-07 07:36:36 +03:00
if ( odd & & __get_user ( * fdset , ufdset ) )
return - EFAULT ;
2005-04-17 02:20:36 +04:00
} else {
/* Tricky, must clear full unsigned long in the
* kernel fdset at the end , this makes sure that
* actually happens .
*/
memset ( fdset , 0 , ( ( nr + 1 ) & ~ 1 ) * sizeof ( compat_ulong_t ) ) ;
}
return 0 ;
}
2006-01-15 00:20:43 +03:00
static
2006-12-07 07:36:36 +03:00
int compat_set_fd_set ( unsigned long nr , compat_ulong_t __user * ufdset ,
unsigned long * fdset )
2005-04-17 02:20:36 +04:00
{
unsigned long odd ;
2007-05-08 11:29:02 +04:00
nr = DIV_ROUND_UP ( nr , __COMPAT_NFDBITS ) ;
2005-04-17 02:20:36 +04:00
if ( ! ufdset )
2006-12-07 07:36:36 +03:00
return 0 ;
2005-04-17 02:20:36 +04:00
odd = nr & 1UL ;
nr & = ~ 1UL ;
while ( nr ) {
unsigned long h , l ;
l = * fdset + + ;
h = l > > 32 ;
2006-12-07 07:36:36 +03:00
if ( __put_user ( l , ufdset ) | | __put_user ( h , ufdset + 1 ) )
return - EFAULT ;
2005-04-17 02:20:36 +04:00
ufdset + = 2 ;
nr - = 2 ;
}
2006-12-07 07:36:36 +03:00
if ( odd & & __put_user ( * fdset , ufdset ) )
return - EFAULT ;
return 0 ;
2005-04-17 02:20:36 +04:00
}
/*
* This is a virtual copy of sys_select from fs / select . c and probably
* should be compared to it from time to time
*/
/*
* We can actually return ERESTARTSYS instead of EINTR , but I ' d
* like to be certain this leads to no problems . So I return
* EINTR just for safety .
*
* Update : ERESTARTSYS breaks at least the xview clock binary , so
* I ' m trying ERESTARTNOHAND which restart only when you want to .
*/
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
int compat_core_sys_select ( int n , compat_ulong_t __user * inp ,
2008-08-31 19:26:40 +04:00
compat_ulong_t __user * outp , compat_ulong_t __user * exp ,
struct timespec * end_time )
2005-04-17 02:20:36 +04:00
{
fd_set_bits fds ;
2007-05-24 00:57:45 +04:00
void * bits ;
2006-12-10 13:21:12 +03:00
int size , max_fds , ret = - EINVAL ;
2005-09-10 02:10:52 +04:00
struct fdtable * fdt ;
2007-05-24 00:57:45 +04:00
long stack_fds [ SELECT_STACK_ALLOC / sizeof ( long ) ] ;
2005-04-17 02:20:36 +04:00
if ( n < 0 )
goto out_nofds ;
2006-12-10 13:21:12 +03:00
/* max_fds can increase, so grab it once to avoid race */
2005-09-10 02:42:34 +04:00
rcu_read_lock ( ) ;
2005-09-10 02:10:52 +04:00
fdt = files_fdtable ( current - > files ) ;
2006-12-10 13:21:12 +03:00
max_fds = fdt - > max_fds ;
2005-09-10 02:42:34 +04:00
rcu_read_unlock ( ) ;
2006-12-10 13:21:12 +03:00
if ( n > max_fds )
n = max_fds ;
2005-04-17 02:20:36 +04:00
/*
* We need 6 bitmaps ( in / out / ex for both incoming and outgoing ) ,
* since we used fdset we need to allocate memory in units of
* long - words .
*/
size = FDS_BYTES ( n ) ;
2007-05-24 00:57:45 +04:00
bits = stack_fds ;
if ( size > sizeof ( stack_fds ) / 6 ) {
bits = kmalloc ( 6 * size , GFP_KERNEL ) ;
ret = - ENOMEM ;
if ( ! bits )
goto out_nofds ;
}
2005-04-17 02:20:36 +04:00
fds . in = ( unsigned long * ) bits ;
fds . out = ( unsigned long * ) ( bits + size ) ;
fds . ex = ( unsigned long * ) ( bits + 2 * size ) ;
fds . res_in = ( unsigned long * ) ( bits + 3 * size ) ;
fds . res_out = ( unsigned long * ) ( bits + 4 * size ) ;
fds . res_ex = ( unsigned long * ) ( bits + 5 * size ) ;
if ( ( ret = compat_get_fd_set ( n , inp , fds . in ) ) | |
( ret = compat_get_fd_set ( n , outp , fds . out ) ) | |
( ret = compat_get_fd_set ( n , exp , fds . ex ) ) )
goto out ;
zero_fd_set ( n , fds . res_in ) ;
zero_fd_set ( n , fds . res_out ) ;
zero_fd_set ( n , fds . res_ex ) ;
2008-08-31 19:26:40 +04:00
ret = do_select ( n , & fds , end_time ) ;
2005-04-17 02:20:36 +04:00
if ( ret < 0 )
goto out ;
if ( ! ret ) {
ret = - ERESTARTNOHAND ;
if ( signal_pending ( current ) )
goto out ;
ret = 0 ;
}
2006-12-07 07:36:36 +03:00
if ( compat_set_fd_set ( n , inp , fds . res_in ) | |
compat_set_fd_set ( n , outp , fds . res_out ) | |
compat_set_fd_set ( n , exp , fds . res_ex ) )
ret = - EFAULT ;
2005-04-17 02:20:36 +04:00
out :
2007-05-24 00:57:45 +04:00
if ( bits ! = stack_fds )
kfree ( bits ) ;
2005-04-17 02:20:36 +04:00
out_nofds :
return ret ;
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE5 ( select , int , n , compat_ulong_t __user * , inp ,
compat_ulong_t __user * , outp , compat_ulong_t __user * , exp ,
struct compat_timeval __user * , tvp )
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
{
2008-08-31 19:26:40 +04:00
struct timespec end_time , * to = NULL ;
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
struct compat_timeval tv ;
int ret ;
if ( tvp ) {
if ( copy_from_user ( & tv , tvp , sizeof ( tv ) ) )
return - EFAULT ;
2008-08-31 19:26:40 +04:00
to = & end_time ;
2008-10-25 23:41:41 +04:00
if ( poll_select_set_timeout ( to ,
tv . tv_sec + ( tv . tv_usec / USEC_PER_SEC ) ,
( tv . tv_usec % USEC_PER_SEC ) * NSEC_PER_USEC ) )
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
return - EINVAL ;
}
2008-08-31 19:26:40 +04:00
ret = compat_core_sys_select ( n , inp , outp , exp , to ) ;
ret = poll_select_copy_remaining ( & end_time , tvp , 1 , ret ) ;
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
return ret ;
}
2010-03-11 02:21:13 +03:00
struct compat_sel_arg_struct {
compat_ulong_t n ;
compat_uptr_t inp ;
compat_uptr_t outp ;
compat_uptr_t exp ;
compat_uptr_t tvp ;
} ;
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE1 ( old_select , struct compat_sel_arg_struct __user * , arg )
2010-03-11 02:21:13 +03:00
{
struct compat_sel_arg_struct a ;
if ( copy_from_user ( & a , arg , sizeof ( a ) ) )
return - EFAULT ;
return compat_sys_select ( a . n , compat_ptr ( a . inp ) , compat_ptr ( a . outp ) ,
compat_ptr ( a . exp ) , compat_ptr ( a . tvp ) ) ;
}
2009-01-14 16:13:57 +03:00
static long do_compat_pselect ( int n , compat_ulong_t __user * inp ,
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
compat_ulong_t __user * outp , compat_ulong_t __user * exp ,
struct compat_timespec __user * tsp , compat_sigset_t __user * sigmask ,
compat_size_t sigsetsize )
{
compat_sigset_t ss32 ;
sigset_t ksigmask , sigsaved ;
struct compat_timespec ts ;
2008-08-31 19:26:40 +04:00
struct timespec end_time , * to = NULL ;
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
int ret ;
if ( tsp ) {
if ( copy_from_user ( & ts , tsp , sizeof ( ts ) ) )
return - EFAULT ;
2008-08-31 19:26:40 +04:00
to = & end_time ;
if ( poll_select_set_timeout ( to , ts . tv_sec , ts . tv_nsec ) )
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
return - EINVAL ;
}
if ( sigmask ) {
if ( sigsetsize ! = sizeof ( compat_sigset_t ) )
return - EINVAL ;
if ( copy_from_user ( & ss32 , sigmask , sizeof ( ss32 ) ) )
return - EFAULT ;
sigset_from_compat ( & ksigmask , & ss32 ) ;
sigdelsetmask ( & ksigmask , sigmask ( SIGKILL ) | sigmask ( SIGSTOP ) ) ;
sigprocmask ( SIG_SETMASK , & ksigmask , & sigsaved ) ;
}
2008-08-31 19:26:40 +04:00
ret = compat_core_sys_select ( n , inp , outp , exp , to ) ;
ret = poll_select_copy_remaining ( & end_time , tsp , 0 , ret ) ;
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
if ( ret = = - ERESTARTNOHAND ) {
/*
* Don ' t restore the signal mask yet . Let do_signal ( ) deliver
* the signal on the way back to userspace , before the signal
* mask is restored .
*/
if ( sigmask ) {
memcpy ( & current - > saved_sigmask , & sigsaved ,
sizeof ( sigsaved ) ) ;
2008-04-30 11:53:06 +04:00
set_restore_sigmask ( ) ;
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
}
} else if ( sigmask )
sigprocmask ( SIG_SETMASK , & sigsaved , NULL ) ;
return ret ;
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE6 ( pselect6 , int , n , compat_ulong_t __user * , inp ,
compat_ulong_t __user * , outp , compat_ulong_t __user * , exp ,
struct compat_timespec __user * , tsp , void __user * , sig )
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
{
compat_size_t sigsetsize = 0 ;
compat_uptr_t up = 0 ;
if ( sig ) {
if ( ! access_ok ( VERIFY_READ , sig ,
sizeof ( compat_uptr_t ) + sizeof ( compat_size_t ) ) | |
__get_user ( up , ( compat_uptr_t __user * ) sig ) | |
__get_user ( sigsetsize ,
( compat_size_t __user * ) ( sig + sizeof ( up ) ) ) )
return - EFAULT ;
}
2009-01-14 16:13:57 +03:00
return do_compat_pselect ( n , inp , outp , exp , tsp , compat_ptr ( up ) ,
sigsetsize ) ;
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
}
2014-03-04 13:53:50 +04:00
COMPAT_SYSCALL_DEFINE5 ( ppoll , struct pollfd __user * , ufds ,
unsigned int , nfds , struct compat_timespec __user * , tsp ,
const compat_sigset_t __user * , sigmask , compat_size_t , sigsetsize )
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
{
compat_sigset_t ss32 ;
sigset_t ksigmask , sigsaved ;
struct compat_timespec ts ;
2008-08-31 19:26:40 +04:00
struct timespec end_time , * to = NULL ;
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
int ret ;
if ( tsp ) {
if ( copy_from_user ( & ts , tsp , sizeof ( ts ) ) )
return - EFAULT ;
2008-08-31 19:26:40 +04:00
to = & end_time ;
if ( poll_select_set_timeout ( to , ts . tv_sec , ts . tv_nsec ) )
return - EINVAL ;
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
}
if ( sigmask ) {
2006-05-15 20:44:27 +04:00
if ( sigsetsize ! = sizeof ( compat_sigset_t ) )
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
return - EINVAL ;
if ( copy_from_user ( & ss32 , sigmask , sizeof ( ss32 ) ) )
return - EFAULT ;
sigset_from_compat ( & ksigmask , & ss32 ) ;
sigdelsetmask ( & ksigmask , sigmask ( SIGKILL ) | sigmask ( SIGSTOP ) ) ;
sigprocmask ( SIG_SETMASK , & ksigmask , & sigsaved ) ;
}
2008-08-31 19:26:40 +04:00
ret = do_sys_poll ( ufds , nfds , to ) ;
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
/* We can restart this syscall, usually */
if ( ret = = - EINTR ) {
/*
* Don ' t restore the signal mask yet . Let do_signal ( ) deliver
* the signal on the way back to userspace , before the signal
* mask is restored .
*/
if ( sigmask ) {
memcpy ( & current - > saved_sigmask , & sigsaved ,
sizeof ( sigsaved ) ) ;
2008-04-30 11:53:06 +04:00
set_restore_sigmask ( ) ;
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
}
ret = - ERESTARTNOHAND ;
} else if ( sigmask )
sigprocmask ( SIG_SETMASK , & sigsaved , NULL ) ;
2008-08-31 19:26:40 +04:00
ret = poll_select_copy_remaining ( & end_time , tsp , 0 , ret ) ;
[PATCH] Add pselect/ppoll system call implementation
The following implementation of ppoll() and pselect() system calls
depends on the architecture providing a TIF_RESTORE_SIGMASK flag in the
thread_info.
These system calls have to change the signal mask during their
operation, and signal handlers must be invoked using the new, temporary
signal mask. The old signal mask must be restored either upon successful
exit from the system call, or upon returning from the invoked signal
handler if the system call is interrupted. We can't simply restore the
original signal mask and return to userspace, since the restored signal
mask may actually block the signal which interrupted the system call.
The TIF_RESTORE_SIGMASK flag deals with this by causing the syscall exit
path to trap into do_signal() just as TIF_SIGPENDING does, and by
causing do_signal() to use the saved signal mask instead of the current
signal mask when setting up the stack frame for the signal handler -- or
by causing do_signal() to simply restore the saved signal mask in the
case where there is no handler to be invoked.
The first patch implements the sys_pselect() and sys_ppoll() system
calls, which are present only if TIF_RESTORE_SIGMASK is defined. That
#ifdef should go away in time when all architectures have implemented
it. The second patch implements TIF_RESTORE_SIGMASK for the PowerPC
kernel (in the -mm tree), and the third patch then removes the
arch-specific implementations of sys_rt_sigsuspend() and replaces them
with generic versions using the same trick.
The fourth and fifth patches, provided by David Howells, implement
TIF_RESTORE_SIGMASK for FR-V and i386 respectively, and the sixth patch
adds the syscalls to the i386 syscall table.
This patch:
Add the pselect() and ppoll() system calls, providing core routines usable by
the original select() and poll() system calls and also the new calls (with
their semantics w.r.t timeouts).
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19 04:44:05 +03:00
return ret ;
}
2011-01-29 16:13:26 +03:00
# ifdef CONFIG_FHANDLE
/*
* Exactly like fs / open . c : sys_open_by_handle_at ( ) , except that it
* doesn ' t set the O_LARGEFILE flag .
*/
2012-12-26 05:24:38 +04:00
COMPAT_SYSCALL_DEFINE3 ( open_by_handle_at , int , mountdirfd ,
struct file_handle __user * , handle , int , flags )
2011-01-29 16:13:26 +03:00
{
return do_handle_open ( mountdirfd , handle , flags ) ;
}
# endif