diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 12:51:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 12:51:41 -0700 |
| commit | 7125764c5d1a5c72d522f1011b6cc8b8100b48fe (patch) | |
| tree | 678f3355ac872a4379b28dbe36f5beddd0e284d8 /fs/compat.c | |
| parent | c6f21243ce1e8d81ad8361da4d2eaa5947b667c4 (diff) | |
| parent | dce44e03b0a3448ad11ac6c6e0cbe299e0400791 (diff) | |
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull compat time conversion changes from Peter Anvin:
"Despite the branch name this is really neither an x86 nor an
x32-specific patchset, although it the implementation of the
discussions that followed the x32 security hole a few months ago.
This removes get/put_compat_timespec/val() and replaces them with
compat_get/put_timespec/val() which are savvy as to the current status
of COMPAT_USE_64BIT_TIME.
It removes several unused and/or incorrect/misleading functions (like
compat_put_timeval_convert which doesn't in fact do any conversion)
and also replaces several open-coded implementations what is now
called compat_convert_timespec() with that function"
* 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
compat: Fix sparse address space warnings
compat: Get rid of (get|put)_compat_time(val|spec)
Diffstat (limited to 'fs/compat.c')
| -rw-r--r-- | fs/compat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/compat.c b/fs/compat.c index 19252b97f0cc..f86df85dff61 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -92,8 +92,8 @@ COMPAT_SYSCALL_DEFINE4(utimensat, unsigned int, dfd, const char __user *, filena struct timespec tv[2]; if (t) { - if (get_compat_timespec(&tv[0], &t[0]) || - get_compat_timespec(&tv[1], &t[1])) + if (compat_get_timespec(&tv[0], &t[0]) || + compat_get_timespec(&tv[1], &t[1])) return -EFAULT; if (tv[0].tv_nsec == UTIME_OMIT && tv[1].tv_nsec == UTIME_OMIT) @@ -505,7 +505,7 @@ COMPAT_SYSCALL_DEFINE5(io_getevents, compat_aio_context_t, ctx_id, struct timespec __user *ut = NULL; if (timeout) { - if (get_compat_timespec(&t, timeout)) + if (compat_get_timespec(&t, timeout)) return -EFAULT; ut = compat_alloc_user_space(sizeof(*ut)); |