From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 31 Jul 2017 12:56:54 +0000 (+0100)
Subject: Revert "syscall: fix dereference of undefined pointer"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bdf211f884113426e1f8226b69731593efa003ea;p=qemu.git

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>
---

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index dfc1301e63..54343c06be 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) {