OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user: Correct signedness of target_flock l_start and l_len fields

Browse Source 
The l_start and l_len fields in the various target_flock structures are
supposed to be '__kernel_off_t' or '__kernel_loff_t', which means they
should be signed, not unsigned. Correcting the structure definitions means
that __get_user() and __put_user() will correctly sign extend them if
the guest is using 32 bit offsets and the host is using 64 bit offsets.

This fixes failures in the LTP 'fcntl14' tests where it checks that
negative seek offsets work correctly.

We reindent the structures to drop hard tabs since we're touching 40%
of the fields anyway.

RV: long long -> abi_llong as suggested by Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2016-06-06 19:58:16 +01:00 committed by Riku Voipio
parent 49ca6f3e24
commit 8efb2ed5ec
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
linux-user/syscall_defs.h
View File

@ -2289,34 +2289,34 @@ struct target_statfs64 {
#endif
struct target_flock {
short l_type;
short l_whence;
abi_ulong l_start;
abi_ulong l_len;
int l_pid;
short l_type;
short l_whence;
abi_long l_start;
abi_long l_len;
int l_pid;
};
struct target_flock64 {
short l_type;
short l_whence;
short l_type;
short l_whence;
#if defined(TARGET_PPC) || defined(TARGET_X86_64) || defined(TARGET_MIPS) \
|| defined(TARGET_SPARC) || defined(TARGET_HPPA) \
|| defined(TARGET_MICROBLAZE) || defined(TARGET_TILEGX)
int __pad;
int __pad;
#endif
unsigned long long l_start;
unsigned long long l_len;
int l_pid;
abi_llong l_start;
abi_llong l_len;
int l_pid;
} QEMU_PACKED;
#ifdef TARGET_ARM
struct target_eabi_flock64 {
short l_type;
short l_whence;
int __pad;
unsigned long long l_start;
unsigned long long l_len;
int l_pid;
short l_type;
short l_whence;
int __pad;
abi_llong l_start;
abi_llong l_len;
int l_pid;
} QEMU_PACKED;
#endif