summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorEd Swierk <eswierk@skyportsystems.com>2014-12-16 12:55:31 -0800
committerRiku Voipio <riku.voipio@linaro.org>2015-01-27 22:33:57 +0200
commit9c6bf9c7d71d7da18a024182b69569969449d6f9 (patch)
tree328fb981bf2a6730b5630f530b5bde0f8745eb8e
parent95018018caeea209f58695645fd1d50a9d0ba6df (diff)
downloadfocaccia-qemu-9c6bf9c7d71d7da18a024182b69569969449d6f9.tar.gz
focaccia-qemu-9c6bf9c7d71d7da18a024182b69569969449d6f9.zip
linux-user: Fix ioctl cmd type mismatch on 64-bit targets
linux-user passes the cmd argument of the ioctl syscall as a signed long,
but compares it to an unsigned int when iterating through the ioctl_entries
list.  When the cmd is a large value like 0x80047476 (TARGET_TIOCSWINSZ on
mips64) it gets sign-extended to 0xffffffff80047476, causing the comparison
to fail and resulting in lots of spurious "Unsupported ioctl" errors.
Changing the target_cmd field in the ioctl_entries list to a signed int
causes those values to be sign-extended as well during the comparison.

Signed-off-by: Ed Swierk <eswierk@skyportsystems.com>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
-rw-r--r--linux-user/syscall.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5658b66499..683f8ccef5 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3278,7 +3278,7 @@ typedef abi_long do_ioctl_fn(const IOCTLEntry *ie, uint8_t *buf_temp,
                              int fd, abi_long cmd, abi_long arg);
 
 struct IOCTLEntry {
-    unsigned int target_cmd;
+    int target_cmd;
     unsigned int host_cmd;
     const char *name;
     int access;