Commit c4c5ff09 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull tile architecture fixes from Chris Metcalf:
 "This fixes the bug that Al Viro spotted with the compat llseek code.
  I also fixed the compat syscall definitions to use the new syscall
  define macros to properly sign-extend their arguments."

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: properly use COMPAT_SYSCALL_DEFINEx
  tile: work around bug in the generic sys_llseek
parents 92e840b8 87c319a2
...@@ -288,6 +288,9 @@ long compat_sys_sync_file_range2(int fd, unsigned int flags, ...@@ -288,6 +288,9 @@ long compat_sys_sync_file_range2(int fd, unsigned int flags,
long compat_sys_fallocate(int fd, int mode, long compat_sys_fallocate(int fd, int mode,
u32 offset_lo, u32 offset_hi, u32 offset_lo, u32 offset_hi,
u32 len_lo, u32 len_hi); u32 len_lo, u32 len_hi);
long compat_sys_llseek(unsigned int fd, unsigned int offset_high,
unsigned int offset_low, loff_t __user * result,
unsigned int origin);
/* Assembly trampoline to avoid clobbering r0. */ /* Assembly trampoline to avoid clobbering r0. */
long _compat_sys_rt_sigreturn(void); long _compat_sys_rt_sigreturn(void);
......
...@@ -32,50 +32,65 @@ ...@@ -32,50 +32,65 @@
* adapt the usual convention. * adapt the usual convention.
*/ */
long compat_sys_truncate64(char __user *filename, u32 dummy, u32 low, u32 high) COMPAT_SYSCALL_DEFINE4(truncate64, char __user *, filename, u32, dummy,
u32, low, u32, high)
{ {
return sys_truncate(filename, ((loff_t)high << 32) | low); return sys_truncate(filename, ((loff_t)high << 32) | low);
} }
long compat_sys_ftruncate64(unsigned int fd, u32 dummy, u32 low, u32 high) COMPAT_SYSCALL_DEFINE4(ftruncate64, unsigned int, fd, u32, dummy,
u32, low, u32, high)
{ {
return sys_ftruncate(fd, ((loff_t)high << 32) | low); return sys_ftruncate(fd, ((loff_t)high << 32) | low);
} }
long compat_sys_pread64(unsigned int fd, char __user *ubuf, size_t count, COMPAT_SYSCALL_DEFINE6(pread64, unsigned int, fd, char __user *, ubuf,
u32 dummy, u32 low, u32 high) size_t, count, u32, dummy, u32, low, u32, high)
{ {
return sys_pread64(fd, ubuf, count, ((loff_t)high << 32) | low); return sys_pread64(fd, ubuf, count, ((loff_t)high << 32) | low);
} }
long compat_sys_pwrite64(unsigned int fd, char __user *ubuf, size_t count, COMPAT_SYSCALL_DEFINE6(pwrite64, unsigned int, fd, char __user *, ubuf,
u32 dummy, u32 low, u32 high) size_t, count, u32, dummy, u32, low, u32, high)
{ {
return sys_pwrite64(fd, ubuf, count, ((loff_t)high << 32) | low); return sys_pwrite64(fd, ubuf, count, ((loff_t)high << 32) | low);
} }
long compat_sys_lookup_dcookie(u32 low, u32 high, char __user *buf, size_t len) COMPAT_SYSCALL_DEFINE4(lookup_dcookie, u32, low, u32, high,
char __user *, buf, size_t, len)
{ {
return sys_lookup_dcookie(((loff_t)high << 32) | low, buf, len); return sys_lookup_dcookie(((loff_t)high << 32) | low, buf, len);
} }
long compat_sys_sync_file_range2(int fd, unsigned int flags, COMPAT_SYSCALL_DEFINE6(sync_file_range2, int, fd, unsigned int, flags,
u32 offset_lo, u32 offset_hi, u32, offset_lo, u32, offset_hi,
u32 nbytes_lo, u32 nbytes_hi) u32, nbytes_lo, u32, nbytes_hi)
{ {
return sys_sync_file_range(fd, ((loff_t)offset_hi << 32) | offset_lo, return sys_sync_file_range(fd, ((loff_t)offset_hi << 32) | offset_lo,
((loff_t)nbytes_hi << 32) | nbytes_lo, ((loff_t)nbytes_hi << 32) | nbytes_lo,
flags); flags);
} }
long compat_sys_fallocate(int fd, int mode, COMPAT_SYSCALL_DEFINE6(fallocate, int, fd, int, mode,
u32 offset_lo, u32 offset_hi, u32, offset_lo, u32, offset_hi,
u32 len_lo, u32 len_hi) u32, len_lo, u32, len_hi)
{ {
return sys_fallocate(fd, mode, ((loff_t)offset_hi << 32) | offset_lo, return sys_fallocate(fd, mode, ((loff_t)offset_hi << 32) | offset_lo,
((loff_t)len_hi << 32) | len_lo); ((loff_t)len_hi << 32) | len_lo);
} }
/*
* Avoid bug in generic sys_llseek() that specifies offset_high and
* offset_low as "unsigned long", thus making it possible to pass
* a sign-extended high 32 bits in offset_low.
*/
COMPAT_SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned int, offset_high,
unsigned int, offset_low, loff_t __user *, result,
unsigned int, origin)
{
return sys_llseek(fd, offset_high, offset_low, result, origin);
}
/* Provide the compat syscall number to call mapping. */ /* Provide the compat syscall number to call mapping. */
#undef __SYSCALL #undef __SYSCALL
#define __SYSCALL(nr, call) [nr] = (call), #define __SYSCALL(nr, call) [nr] = (call),
...@@ -83,6 +98,7 @@ long compat_sys_fallocate(int fd, int mode, ...@@ -83,6 +98,7 @@ long compat_sys_fallocate(int fd, int mode,
/* See comments in sys.c */ /* See comments in sys.c */
#define compat_sys_fadvise64_64 sys32_fadvise64_64 #define compat_sys_fadvise64_64 sys32_fadvise64_64
#define compat_sys_readahead sys32_readahead #define compat_sys_readahead sys32_readahead
#define sys_llseek compat_sys_llseek
/* Call the assembly trampolines where necessary. */ /* Call the assembly trampolines where necessary. */
#define compat_sys_rt_sigreturn _compat_sys_rt_sigreturn #define compat_sys_rt_sigreturn _compat_sys_rt_sigreturn
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment