From patchwork Thu Mar 7 10:06:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1052769 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44FRGr34VPz9sDn for ; Thu, 7 Mar 2019 21:11:00 +1100 (AEDT) Received: from localhost ([127.0.0.1]:48521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1pzO-0006gs-7e for incoming@patchwork.ozlabs.org; Thu, 07 Mar 2019 05:10:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1pvs-00047t-Sk for qemu-devel@nongnu.org; Thu, 07 Mar 2019 05:07:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1pvr-0007WV-Aa for qemu-devel@nongnu.org; Thu, 07 Mar 2019 05:07:20 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:52225) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1pvq-0007VE-Tl for qemu-devel@nongnu.org; Thu, 07 Mar 2019 05:07:19 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MfYDO-1gZ6sz2WoC-00fwwY; Thu, 07 Mar 2019 11:07:05 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 11:06:54 +0100 Message-Id: <20190307100656.14044-8-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190307100656.14044-1-laurent@vivier.eu> References: <20190307100656.14044-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:IEXf1zpYmXWMh8fiH2hvQTB1d8oqff2LKB+3BWU31Zz9VdPTSn4 oGjVRkDlpYTmGqbpYFkF0mjJ3KWmBrlsl6wcrqfcoxIc7yj0MltgG7DDcrPKVJjOrtw93SW bwATosfNk61mS+B83EMWxfDtG6pq8msVxFl44EwJtiIzEoFF+bqYThah/Z1mgnuNDn0GNyS 3bFdmzG7iIdquC/PNCmcw== X-UI-Out-Filterresults: notjunk:1; V03:K0:XwUl3C3YBXM=:GKdM5ROWMPSiAEsv9RP57y bALpT6CjbX7JRE39jveL3X6TBjDvMn8FSLhlVr6yk27auOvuAeuaZh0JWzq6PQVKObiijvBzo gmgcR5CsLd9qjwHeozOzAyvPCmLUUBOi9oPkXGxrxyW8TnAWigKAo+g1VkfyzSflkUZOIAlG2 GqYWr+bU/I+rJ7rZ3FASjtoLOQ09En2Z07WHutRJ2z5B4RKEQDYBw4LRFlLf2JoshLaxI1gG8 LTypj/riEha8fUYOT28CTjEV4eGmcy4rJXGNzskxmqEhon47exWEluAbmLIpubJTkzVeNkFAY CcVa0wfO4HHQx7LDYIOKujNqf981MkSrVPx71dBEITPHjg4OXlllc9BaouCS7x5UjUVPbQM76 UYDQxFBf8OLWM6H3u9KJB3VlpU2fE0V9myDfluZQEQrA9nn8R1iG2IA4zW37p/88+eqbIYjUm 44cQHzAw3UTpP8mB0eFUxZC/73DaNeQ0BSFRVrCzfid7lgu3Idhl5IDdGI3rHNtbEuVG4vt0r mI8E3JZ12DNDo7R784+F8lOLT7+PN03fibcfzJTMsU+VMVy3MxEgxNtlPvAx+xPGcgykh4oLT 49AtLgkt8Qs/Sg5unx4/9Q3xKY70q+5DSZSjesjrRzJYQ/rTsau2jYNCFaMNYa3Usoebg0HAQ wqorN4ZammDpK2Pi6XhjqrshOiA0V8J41mMbzDiQN/WOFtse83ScrUsoHDFZ05bY1HGtibKU4 d9tU6rxmcQWDZyi5dqm5Jwen+jGk9H1BcGxrltXMvowgD/3hE51O91j9N5A= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 7/9] linux-user: fix "may be used uninitialized" warnings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Fixes: /home/elmarco/src/qemu/linux-user/syscall.c: In function ‘do_ioctl_rt’: /home/elmarco/src/qemu/linux-user/syscall.c:4773:9: error: ‘host_rt_dev_ptr’ may be used uninitialized in this function [-Werror=maybe-uninitialized] if (*host_rt_dev_ptr != 0) { ^~~~~~~~~~~~~~~~ /home/elmarco/src/qemu/linux-user/syscall.c:4774:9: error: ‘target_rt_dev_ptr’ may be used uninitialized in this function [-Werror=maybe-uninitialized] unlock_user((void *)*host_rt_dev_ptr, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *target_rt_dev_ptr, 0); ~~~~~~~~~~~~~~~~~~~~~~ Based on previous discussion from patch "linux-users/syscall: make do_ioctl_rt safer" by Alex Bennée. Signed-off-by: Marc-André Lureau Reviewed-by: Laurent Vivier Message-Id: <20190305151500.25038-1-marcandre.lureau@redhat.com> Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9f7eb7d7a896..208fd1813d6a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4733,8 +4733,8 @@ static abi_long do_ioctl_rt(const IOCTLEntry *ie, uint8_t *buf_temp, const int *dst_offsets, *src_offsets; int target_size; void *argptr; - abi_ulong *target_rt_dev_ptr; - unsigned long *host_rt_dev_ptr; + abi_ulong *target_rt_dev_ptr = NULL; + unsigned long *host_rt_dev_ptr = NULL; abi_long ret; int i; @@ -4780,6 +4780,9 @@ static abi_long do_ioctl_rt(const IOCTLEntry *ie, uint8_t *buf_temp, unlock_user(argptr, arg, 0); ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp)); + + assert(host_rt_dev_ptr != NULL); + assert(target_rt_dev_ptr != NULL); if (*host_rt_dev_ptr != 0) { unlock_user((void *)*host_rt_dev_ptr, *target_rt_dev_ptr, 0);