fs: Fix sign extension problem in sys_llseek
Subsystems (4)
PATCH 1/2 fs: Fix sign extension problem in sys_llseek
In fs/read_write.c:
SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,
unsigned long, offset_low, loff_t __user *, result, unsigned int, origin)
...
offset = vfs_llseek(file, ((loff_t) offset_high << 32) | offset_low,
origin);
On a 64-bit system that define CONFIG_HAVE_SYSCALL_WRAPPERS SYSCALL_DEFINEx will truncate long arguments to 32-bit and on some architectures such as MIPS sign-extended to 64-bit again. On such architectures passing a value with bit 31 in offset_low set will result in a huge 64-bit offset being passed to vfs_llseek() and it failiing with EINVAL.
The issue was discovered on Debian's MIPS infrastructure machines running e2fsck:
[...]
This was noticed on one of the Debian
infrastructure machines where, after an upgrade, e2fsck began failing with errors like:
Error reading block 524290 (Invalid argument) while getting next inode from scan. Ignore error<y>?
[...]
Fixed by changing the prototype to use 32-bit arguments for the higher and lower half of offset of sys_llseek.
fs/read_write.c | 4 ++-- include/linux/syscalls.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
fs/read_write.c +2 -2
@@ -171,8 +171,8 @@ bad: }#ifdef __ARCH_WANT_SYS_LLSEEK -SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high, - unsigned long, offset_low, loff_t __user *, result, +SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned int, offset_high, + unsigned int, offset_low, loff_t __user *, result, unsigned int, origin) {int retval;
include/linux/syscalls.h +2 -2
@@ -444,8 +444,8 @@ asmlinkage long sys_utimes(char __user *filename, struct timeval __user *utimes);asmlinkage long sys_lseek (unsigned int fd,off_t offset,unsigned int origin); -asmlinkage long sys_llseek (unsigned int fd,unsigned long offset_high, -unsigned long offset_low,loff_t __user *result, +asmlinkage long sys_llseek (unsigned int fd,unsigned int offset_high, +unsigned int offset_low,loff_t __user *result,unsigned int origin);asmlinkage long sys_read (unsigned int fd,char __user *buf,size_t count);asmlinkage long sys_readahead (int fd,loff_t offset,size_t count);
Quoted 7 lines · On Wed, 25 Mar 2009 01:13:03 +0100 Ralf Baechle <[email protected]> wrote:
In
fs/read_write.c:SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long,
offset_high,
unsigned long,offset_low,loff_t__user*, result, unsigned int, origin)
...
offset = vfs_llseek(file, ((loff_t)offset_high<< 32) |offset_low,
Quoted 7 lines
origin);On a 64-bit system that define
CONFIG_HAVE_SYSCALL_WRAPPERSSYSCALL_DEFINExwill truncate long arguments to 32-bit and on some architectures such as MIPS sign-extended to 64-bit again. On such architectures passing a value with bit 31 inoffset_lowset will result in a huge 64-bit offset being passed tovfs_llseek()and it failiing with EINVAL.
How is that possible? If you have CONFIG_HAVE_SYSCALL_WRAPPERS defined then the wrapper will (in this case) cast offset_low from long to unsigned long. It won't truncate or sign extend anything here. The whole operation should be a NOP.
This is what you get after macro expansion (BUILD_BUG_ON removed):
long sys_llseek(unsigned int fd, unsigned long offset_high, unsigned long offset_low, loff_t * result, unsigned int origin);
static inline __attribute__((always_inline))
long SYSC_llseek(unsigned int fd, unsigned long offset_high, unsigned long offset_low, loff_t * result, unsigned int origin);
long SyS_llseek(long fd, long offset_high, long offset_low, long result, long origin)
{
return (long) SYSC_llseek((unsigned int) fd, (unsigned long) offset_high, (unsigned long) offset_low, (loff_t *) result, (unsigned int) origin);
}asm ("\t.globl " "sys_llseek" "\n\t.set " "sys_llseek" ", " "SyS_llseek");
static inline __attribute__((always_inline))
long SYSC_llseek(unsigned int fd, unsigned long offset_high, unsigned long offset_low, loff_t * result, unsigned int origin)
{
[...]
}