aboutsummaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-31 13:56:54 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-31 13:56:54 +0100
commitbdf211f884113426e1f8226b69731593efa003ea (patch)
tree4ade3e08de279b95f1c5a3fbdbaf7e81e8ab27b1 /linux-user
parent25dd0e77898c3e10796d4cbeb35e8af5ba6ce975 (diff)
downloadqemu-bdf211f884113426e1f8226b69731593efa003ea.zip
qemu-bdf211f884113426e1f8226b69731593efa003ea.tar.gz
qemu-bdf211f884113426e1f8226b69731593efa003ea.tar.bz2
Revert "syscall: fix dereference of undefined pointer"
This reverts commit bc658e4a2e81593f75a3ae34b112be77efbb3e0a. Some versions of gcc warn about this: linux-user/syscall.c: In function ‘do_ioctl_rt’: linux-user/syscall.c:5577:37: error: ‘host_rt_dev_ptr’ may be used uninitialized in this function [-Werror=uninitialized] and in particular the Travis builds fail; they use gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3. Revert the change to fix the travis builds. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/syscall.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index dfc1301..54343c0 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5574,7 +5574,6 @@ static abi_long do_ioctl_rt(const IOCTLEntry *ie, uint8_t *buf_temp,
field_types, THUNK_HOST);
}
unlock_user(argptr, arg, 0);
- assert(host_rt_dev_ptr);
ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp));
if (*host_rt_dev_ptr != 0) {