diff options
| author | Nicolas Pitre <nico@cam.org> | 2006-01-14 16:35:03 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-14 16:35:03 +0000 |
| commit | 713c481519f19df9e6d90f257e7da0336b057592 (patch) | |
| tree | b8242d9f1b94f94a7075a021a3f80ddf0c0de25c /arch/arm/kernel | |
| parent | 704bdda03827db8a551e82b312037d63ba3c22ff (diff) | |
| download | op-kernel-dev-713c481519f19df9e6d90f257e7da0336b057592.zip op-kernel-dev-713c481519f19df9e6d90f257e7da0336b057592.tar.gz | |
[ARM] 3108/2: old ABI compat: statfs64 and fstatfs64
Patch from Nicolas Pitre
struct statfs64 has extra padding with EABI growing its size from 84 to
88. This struct is now __attribute__((packed,aligned(4))) with a small
assembly wrapper to force the sz argument to 84 if it is 88 to avoid
copying the extra padding over user space memory unexpecting it.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/calls.S | 4 | ||||
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 55076a7..8c0bf04 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S @@ -280,8 +280,8 @@ __syscall_start: .long sys_clock_gettime .long sys_clock_getres /* 265 */ .long sys_clock_nanosleep - .long sys_statfs64 - .long sys_fstatfs64 + .long sys_statfs64_wrapper + .long sys_fstatfs64_wrapper .long sys_tgkill .long sys_utimes /* 270 */ .long sys_arm_fadvise64_64 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 34826bc..ee63ee7 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -262,6 +262,16 @@ sys_sigaltstack_wrapper: ldr r2, [sp, #S_OFF + S_SP] b do_sigaltstack +sys_statfs64_wrapper: + teq r1, #88 + moveq r1, #84 + b sys_statfs64 + +sys_fstatfs64_wrapper: + teq r1, #88 + moveq r1, #84 + b sys_fstatfs64 + /* * Note: off_4k (r5) is always units of 4K. If we can't do the requested * offset, we return EINVAL. |
