From: Ed Swierk Date: Tue, 16 Dec 2014 20:55:31 +0000 (-0800) Subject: linux-user: Fix ioctl cmd type mismatch on 64-bit targets X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9c6bf9c7d71d7da18a024182b69569969449d6f9;p=qemu.git 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 Signed-off-by: Riku Voipio --- 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;