From patchwork Fri Mar 27 09:49:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184996 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1096755ilr; Fri, 27 Mar 2020 02:50:07 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtv1Yf9gOzOHIXPfbvqcXP1tzXV8JimdBlxJF7/NIhgTsdOaFUqRb0CCIXQVsCjkCSfieyF X-Received: by 2002:a37:9d10:: with SMTP id g16mr13484714qke.85.1585302607845; Fri, 27 Mar 2020 02:50:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585302607; cv=none; d=google.com; s=arc-20160816; b=NZZgZiwUVt5LQmohLhOxYktIQPcmXZANhN62KitVIz2QNf8iShwrWZ7Wh0IdtLBEVO 14FNCaOYAbgMQpXEPGqQBQJtma00JL/oQeD7vaH8NWqVprkNeIeh6sHzOo44w8XQrLPK cLGiG8+W5GRvF3xHHqJ/n2yfb3wIedu/BIoHPoOf4Vf+gc6LwlSULE7PvbqslevgG3iY eMkPlGDBK3yrVb1ueJwGsILswhzJpKne6ukO0Y826qYmE5HI5yHFea7uGBeAseEGISlr xAqyzcJhDLSu+e0QFl89GOnYysi1ZYGDJ2VTCnshnyjxzjvRn5ivyeJlNs/22V2AYFjS GO+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=OZ5+uHHTVpcB1oDwgp/gP+r+CwoI6bpOzQcnXUvRt7M=; b=0mfgzvn8SdrHtgzjHlLXlyaeO+c+QMnY46iNkx4Go1DZNEKd5ccwCrtJPac4vxAPBt t10Xf5Cicic+RYdDNrHKTJZh+UFYPxV0HkavKuNudkHE982LxMRrhEHp/E6tR/LL5e4Z 6x7BltUz399htnrWv8PjQw+yWAQ3lX9EFgsCWHd8G9AviSXngjUtyPhLsIYMQDzu9ig6 lYlFza9Y+1SBcWNFcU+V9Tfn45vBGiBSfsgewqSq9VqN+xo+ECjoWqggOnTS/a3rf/4v KFz6bmRUwiF4dA5Lh/ilnzs7K4d2fJKoKXxKVwzFRlKbww/4owse8pih3cghkGVge30N 9Lgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nvDaZKWs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i64si3120622qtd.332.2020.03.27.02.50.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 02:50:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nvDaZKWs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlcs-0003U9-To for patch@linaro.org; Fri, 27 Mar 2020 05:50:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37823) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlcd-0003NO-GI for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHlcc-0003iL-Jj for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:51 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:52754) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHlcc-0003gA-D8 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:50 -0400 Received: by mail-wm1-x343.google.com with SMTP id z18so10746827wmk.2 for ; Fri, 27 Mar 2020 02:49:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OZ5+uHHTVpcB1oDwgp/gP+r+CwoI6bpOzQcnXUvRt7M=; b=nvDaZKWsPycaLMQ1RALZosCGJIKvemRNj59SqxKFKLnKx5ecNnh1lnaWABMhX4fFNj 9mh56d58nUUZrPR8BYWE9VbEDk2mGbOsG1ezrz0pbLATi/3/1aWVlytLFFbfc+wnsS7/ lR3EgpDX6+J4xh/8tIjGzmCAY9iJZcWfYpkL1Rl2707f7AbkKw0jHTtzHNftHB3LZ9OH JFITs9PZkea+q8bvt607m0Vp3Fo/P/yywcMy9nsiJzmNVYd8JGhHl3wNnfuo3asR3HSW ukRq/cIBqIC3mJFuJuTJLV5xc8FBOWMZaLNovcQEIZ7+mustAOZzR5TRW2E61ayMeveR HtIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OZ5+uHHTVpcB1oDwgp/gP+r+CwoI6bpOzQcnXUvRt7M=; b=CgqFeOBb1F9yNcl8Jn+Cuga70eStqdRuAxdakTq2Vd26pv1sDfqjZKw4YQGBpiNjjX K0UgznqmzWvKj9gB1o6IMDVJnFScJv0MRrvlxyV3jf1V47mxIXbTCGYg4TL9qabj1jb8 ZBY6XmLGFQwcn070oTOUfqufjKTGi7cC5tXk88DPmzQe7PxxtcNrbY9b/HXw52QQidWC pTvXZUVaP+cFdxR+IaysoLzIJ1d285AvFWMu58UUJvIqRfmNWbs7JQbS2itX51ss452N v7MfTLkP4sIQq+pnaMEYTQMeY9/y7OyG/qSKMLNxLCUQbvTw2jbkiUj9D3JU3K8HMOsW ZDnw== X-Gm-Message-State: ANhLgQ1K65wcXPcys2rY2WVjWwbaRIKqkyNSuYumGTHMQipj/Yy1de9a 4sFubf7v45spKw9+eNA4QrmrGrjTcNI= X-Received: by 2002:a1c:6285:: with SMTP id w127mr4720362wmb.133.1585302589326; Fri, 27 Mar 2020 02:49:49 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c189sm7367293wmd.12.2020.03.27.02.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 02:49:46 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 78A731FF87; Fri, 27 Mar 2020 09:49:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/7] elf-ops: bail out if we have no function symbols Date: Fri, 27 Mar 2020 09:49:39 +0000 Message-Id: <20200327094945.23768-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327094945.23768-1-alex.bennee@linaro.org> References: <20200327094945.23768-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" It's perfectly possible to have no function symbols in your elf file and if we do the undefined behaviour sanitizer rightly complains about us passing NULL to qsort. Check nsyms before we go ahead. Signed-off-by: Alex Bennée --- include/hw/elf_ops.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index a1411bfcab6..b5d4074d1e3 100644 --- a/include/hw/elf_ops.h +++ b/include/hw/elf_ops.h @@ -170,8 +170,13 @@ static int glue(load_symbols, SZ)(struct elfhdr *ehdr, int fd, int must_swab, } i++; } - syms = g_realloc(syms, nsyms * sizeof(*syms)); + /* check we have symbols left */ + if (nsyms == 0) { + goto fail; + } + + syms = g_realloc(syms, nsyms * sizeof(*syms)); qsort(syms, nsyms, sizeof(*syms), glue(symcmp, SZ)); for (i = 0; i < nsyms - 1; i++) { if (syms[i].st_size == 0) { From patchwork Fri Mar 27 09:49:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184998 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1097957ilr; Fri, 27 Mar 2020 02:51:44 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv9z1V3UdsYnDMjNYGwIPfXJ4wp8HUtYlehP6eSptvvqr+2UoV21Pvp9/kv6bRWLqqfkK8l X-Received: by 2002:ac8:38cc:: with SMTP id g12mr13339869qtc.186.1585302704130; Fri, 27 Mar 2020 02:51:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585302704; cv=none; d=google.com; s=arc-20160816; b=fj29FPjBpj4F0dtvl7P0dWxeGDDYkUUi6Bg5t/KLFZ9GPJGClvYHEtBnA8Wvd9k1k+ n3zFHVg6MBeVlMzW+r+rlIWwCmYZwQHPna0xskj3Et8lWFAdnGlmMPr5U4vWctSEcK3T kUAMSTZA/0Y0ZsB/jmq4h/9Q+FGVhVpwF78Fv+HH6jUfZ2zfdcHbYm0g8UjdmFDuRt+A D4kgwiXdmSF3eVx+YR7cNMlzk4wfoPSj2veZb8E3JR9AVtz4gBHrgVPN7bNu0PGwDlt1 wGJZGnIcRE8Qvn/JJ8d3CTffWXxTdBDsAtJjc/XEFP8hbzOj4S2EqIKOQ5xakT2RuYJQ pQNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=UvjQIXOYDmX/EoTXnR+r4XSFKQrLP267MXe/Bc4WNPw=; b=fNuCpIFUjIcYWQkBo/ymbUyhvmUwGCH9KlmjHbhRowf8/EzomT5XL0v3GITDxmnxKu ag4m1PB7k5UbIJRdqup+/ce/4KOl9buD+Dz4SPaJqpma8I+HzYyBYNnRGVGPdKqFiwYc KBNJiYOtOkUPOEiOirPaGBmPaoN0+fxsVAll0XeajV8eiSMlbIwCKkhJ8czkOfHe+ZT/ fKnXSXQjqPCcmAincCHMMMs85TijejTkwYxiV+fFVL5YxNqDYWumL3alIknn447bFdaa qjb36FIUL7GFCsvt6IuAHVjeOHouajfxCC0qzX1iqESEeUJSRgegUl7M2mxj6LcwYaPj a6eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YumT0yhK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r20si2951749qvh.184.2020.03.27.02.51.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 02:51:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YumT0yhK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHleR-0006ti-Ko for patch@linaro.org; Fri, 27 Mar 2020 05:51:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37771) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlcc-0003LD-I2 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHlcb-0003do-A1 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:50 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:46507) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHlca-0003Xv-Vo for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:49 -0400 Received: by mail-wr1-x441.google.com with SMTP id j17so10544549wru.13 for ; Fri, 27 Mar 2020 02:49:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UvjQIXOYDmX/EoTXnR+r4XSFKQrLP267MXe/Bc4WNPw=; b=YumT0yhKzv9AigpJ/m+kwl7j+CxbLGRmOx2luHxqdwL1f88CPIFa4Df5AxGvK8dRQQ KWeANL3vPWc5trJQeuwUpmIAgeftnX/V72XcX3kwAuytuUsu5WQEayFoovTiWme+drXx 6LTw2ijnk7fsw9fgNTxvOPnTJGzGRvC59aPPEUfpTA+s/DBiUTWFPZinzPnoyENuZTm8 MWEajZHfaKibu3xZzSn3mDNdks8WmIywA5Uq0Q+ckaMQVUE6qgD9FOwHwRIXEgagL+Bb tcBtBS93mN4WfxqycBgtNLIAcH7d3iN8odFGcj5rfXL5ggiw34SKuJ0ZKyJLksaJt5SJ w2lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UvjQIXOYDmX/EoTXnR+r4XSFKQrLP267MXe/Bc4WNPw=; b=L6HmDyGI3R0tfUSVTs73OqoY0Qc8eLcrAg2EbAiYGDuG0KxnqA3L+6AEB8cfTpmgk6 fy0bFi5w526mGcxXz/0pPDOE5A9CveoGUExqR1qIlP2yuEH7BUZJqgVMVWq2x9WIx0UW KcM305AUh6l0mrw0zBNq2kJVHZCnC6YFnxdgRz87Ius6Xz4UgLn7XA97GR98b/ee9O7T QjqjXGn+ok4pPIBxsBzzttuYL9zQsIHd6S/PJOrxCMMWxs4hw0p48xg0BJ2qAZ1uDWJ6 K2RKkyXmTLC7o9YD0Ngvee8Vay5ESdzzMWu19nJMPaDmQSMZLLYtnXB0JX5SOsOtzmks 0Ppg== X-Gm-Message-State: ANhLgQ1tKlsnmO7IlWYaNgB+gTeidjOhu90gKhcP4kR1Tt7aFSHK4LQS ddBBbLehj0tezLYruw8qKurytw== X-Received: by 2002:adf:e946:: with SMTP id m6mr14582541wrn.187.1585302587304; Fri, 27 Mar 2020 02:49:47 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w204sm7521430wma.1.2020.03.27.02.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 02:49:46 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 910461FF8C; Fri, 27 Mar 2020 09:49:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/7] linux-user: protect fcntl64 with an #ifdef Date: Fri, 27 Mar 2020 09:49:40 +0000 Message-Id: <20200327094945.23768-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327094945.23768-1-alex.bennee@linaro.org> References: <20200327094945.23768-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Checking TARGET_ABI_BITS is sketchy - we should check for the presence of the define to be sure. Also clean up the white space while we are there. Signed-off-by: Alex Bennée --- linux-user/syscall.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Laurent Vivier Reviewed-by: Richard Henderson diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 49395dcea97..a3da46d69f9 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -11223,11 +11223,11 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, This is a hint, so ignoring and returning success is ok. */ return 0; #endif -#if TARGET_ABI_BITS == 32 +#ifdef TARGET_NR_fcntl64 case TARGET_NR_fcntl64: { - int cmd; - struct flock64 fl; + int cmd; + struct flock64 fl; from_flock64_fn *copyfrom = copy_from_user_flock64; to_flock64_fn *copyto = copy_to_user_flock64; @@ -11238,7 +11238,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, } #endif - cmd = target_to_host_fcntl_cmd(arg2); + cmd = target_to_host_fcntl_cmd(arg2); if (cmd == -TARGET_EINVAL) { return cmd; } From patchwork Fri Mar 27 09:49:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184999 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1098771ilr; Fri, 27 Mar 2020 02:52:40 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtr3ye0M9DHQxTGhoFD45kOROiXriq8+DXGN9JOyOGcpO56NR/dH6JrCZLiHg+/Zpd0Akdh X-Received: by 2002:aed:31c1:: with SMTP id 59mr12605700qth.370.1585302760316; Fri, 27 Mar 2020 02:52:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585302760; cv=none; d=google.com; s=arc-20160816; b=QjVbfDfmF0wvflV4s5cizCPBU4dX3uP7wfpiOy5l9vFp8psNuizu9xRVI+paWrNVz4 urqdMCmB3aRM9ALGShQAncmrwok6/pZ+46ifJnk9r2s2PCHrKAHNaq4uBguFpbHT0w3B VUhn4U3Hv48dEzDhptGJPFI4ledAkzsYcyCPlJOUCyNRwGv7c3iHp+IYjBHisWl9Bk4X QTE8TopPITSmg72bQGRVTHpFuGBGdC5r9lt9Cm7nmFTNbCEODbhz42CA2hk6mEsnLimW o/I2So7Z8fIhePjYqrd7nogjWIaslGPuOEHi7Dp/2jWCgEaT+rKzStpnOJtNkp6adjnY g5Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=NX+/xJBO2eLA0qrDo402hCKb9wStxwlhkWpgyP99xxg=; b=Opfie+2vBaAe3VP5TBIvGGKdZpapbZzdZny4X+ppTEw5DBNjmi3b1iNGHLv2dp6aZa 9lDNBCoJtl6UaFDe9dK9aC6wntyduQAGQG8MnOMIDvptmJaxUibb3yHO1LR2+VYzlXMC 3YOtZ5e8Haip/+vFmI0J+KweFsQfKMdAuF/nFluMciN20wANho0TaH+zkmn/jjT2MwQ+ vol+dUBzQpnKZyjxhk0lo5tEBVdTuS3ElOTpTsDnbw3P6N6kUF270DHqHgHA6SAHy/1t /So8vSo60/BYi67cJblwl79DEcBWcPqm7TnicggkmNxCILNdSmTFcxgEoqJGGOcHDt2d hobg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=o2TnlfC5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q6si2947284qve.189.2020.03.27.02.52.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 02:52:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=o2TnlfC5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlfL-0000XR-Rz for patch@linaro.org; Fri, 27 Mar 2020 05:52:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37855) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlce-0003PU-Jt for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHlcd-0003kR-Fn for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:52 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHlcd-0003ie-9G for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:51 -0400 Received: by mail-wr1-x444.google.com with SMTP id d5so10655208wrn.2 for ; Fri, 27 Mar 2020 02:49:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NX+/xJBO2eLA0qrDo402hCKb9wStxwlhkWpgyP99xxg=; b=o2TnlfC51qHCoQyELEpYc7/FBX58X9f6fMjHKCdf1Qp0StfokFuDeYcbmoivnyGK5S HhMRiYX9bCjuQpslezT6alSfc0TpabmGCU5HLV0EZxVhxNXpqWJp/f+AVbMeFwNHS7pS TsytYCP5AzXF9UhWotZ8Kf77ZIEWc56RvCxFv43+R/BZCs/3C98jkXCRIDYFqfKS1+l9 MmGUmE17uxii5i9wYPWYuUZjgpiJwVKyl5I6mKLgrcgLkp8RqAe2dod6Mwww51k3BHCF vgBzqMBIkuY3ptMQdZgkdwjq2HqOlBkUo6A7IJ8ke9KhSRF0bGCHpzjOaLhDOyQj9uhm f/Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NX+/xJBO2eLA0qrDo402hCKb9wStxwlhkWpgyP99xxg=; b=nRIkLL7n7tqOLz5GBFW9qiFwpQhe5Pwj3qpvw/Wu2oWxrWxxTJZkPoklDkuGwJXWdH z31IENGbid41XKRTDrtENSXrcHhQLMdyhg8ZRsiQ2R5Mvd7KBSmjtUDrvnRE4Ro0q9bT RgJ6he0m+rrEFIF2NVwhq6UjfoeTWygrGHVU31shHJzxM1bfddSRmDWJA1O9oo6Cfgvg SF05B8k4mVqSTo1ESZ4x+oP5Z5QwDZQBXAXkGKA8/BTxj7C7SW/HaMXwx5S8IM69wLZL R0XcmT3vkntIRHTKc4DjQpu6rJ7rEh0iuIf0AXCsetL7CZsAyK9btj5n0lBvGdHyyYqz RH8w== X-Gm-Message-State: ANhLgQ0WpEqDirtGOLSOtmS0kfNjrlglyW4wMy5jUTzv/4D6PaWP+Pk2 QC4unpEXyxg0CGhhj55ujMVFNw== X-Received: by 2002:adf:fc45:: with SMTP id e5mr7709694wrs.56.1585302590234; Fri, 27 Mar 2020 02:49:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p10sm2851547wre.15.2020.03.27.02.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 02:49:46 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A57B41FF8F; Fri, 27 Mar 2020 09:49:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 3/7] tests/tcg: remove extraneous pasting macros Date: Fri, 27 Mar 2020 09:49:41 +0000 Message-Id: <20200327094945.23768-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327094945.23768-1-alex.bennee@linaro.org> References: <20200327094945.23768-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Eduardo Habkost , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We are not using them and they just get in the way. Signed-off-by: Alex Bennée --- tests/tcg/x86_64/system/boot.S | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson diff --git a/tests/tcg/x86_64/system/boot.S b/tests/tcg/x86_64/system/boot.S index 205cfbd3982..73b19a2bda6 100644 --- a/tests/tcg/x86_64/system/boot.S +++ b/tests/tcg/x86_64/system/boot.S @@ -41,10 +41,7 @@ #define XEN_ELFNOTE_PHYS32_ENTRY 18 #define __ASM_FORM(x) x -#define __ASM_FORM_RAW(x) x -#define __ASM_FORM_COMMA(x) x, -#define __ASM_SEL(a,b) __ASM_FORM(b) -#define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(b) +#define __ASM_SEL(a,b) __ASM_FORM(b) #define _ASM_PTR __ASM_SEL(.long, .quad) ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, _ASM_PTR 0x100000) From patchwork Fri Mar 27 09:49:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 185000 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1099058ilr; Fri, 27 Mar 2020 02:53:00 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuPFtcy1BKkFCY8gvzdy6bsc0mqHya6Eoaem6RVXwH3bO4sf+KGMuu+HXoNIYDjftg8SFse X-Received: by 2002:a37:68d2:: with SMTP id d201mr13448576qkc.231.1585302780640; Fri, 27 Mar 2020 02:53:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585302780; cv=none; d=google.com; s=arc-20160816; b=BRpcY3uB4nsi1pFND4BxB2YuK5EOSsmzmqT+JJ/0PE/r3sJPPEQmZIefDG1oOZI5mu KcRlIKGpXMtdbd0M8sBwlSBA36DayKZKuGodrVEgXxpbPuj8w1GFBBZaMsFnxsy9OKD4 7UN6fJ+nQKp8vs97ryXUCUD2TwKK4wNXsqP8PqwiMd0zyU6GkTFWQ/iJLcsBPbwg9uP8 Y2szDsDO7uy3IRIJfE3r88ypa4pl0fJME0CGDRWKUT2i7GHFJazSHhpqHw29P4Sbq081 53QyKPv5G6A3hzcTbxHZHdRIjGyIKwQ1oIoJmf6+UmcdxK2vKgUDdltXWOaPwmwSk73V Q5pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=MRho6ym8/n7glDorOggjQNgMqNACH9d0SZZCdvsJXcA=; b=nxdjFAGYtSNsBAynk0sqqrikEFjU2Bi58V4LbAVNcpeC9Y5Bbm10tqTf4fL8TRKVOB Rho+DwNLkzAIuvoPSildD4JPH7Ek5jhwZEHzye6a9LoQYM32Sav4QJs7MpVoKzxZXYcb F2hUmnfWu8EeD6p6HhyQJi7CHAdCI2cbTaVMzilU/W53Ygm/OLRRrX4LIkMEvpi5228L LIWIYyTbPt/0KBRod5rDI+x9WwWIBe0k8siZIAPaUgobf3cH132n55dg3BqW4ouQccYP DEpaD1TX+wHXbbpVHTBSfjmOT+4UIVoQpCFMkeKCggoHp3ZiTCSP79drCiM7B/uLTHIi kw3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YqqpBCqG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g63si2950640qtd.324.2020.03.27.02.53.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 02:53:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YqqpBCqG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlfg-00018E-5B for patch@linaro.org; Fri, 27 Mar 2020 05:53:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37899) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlcf-0003S4-Q2 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHlce-0003qu-O2 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:53 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:50572) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHlce-0003mk-Ho for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:52 -0400 Received: by mail-wm1-x341.google.com with SMTP id d198so10762426wmd.0 for ; Fri, 27 Mar 2020 02:49:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MRho6ym8/n7glDorOggjQNgMqNACH9d0SZZCdvsJXcA=; b=YqqpBCqGWUuz4esSzlaJ/LOkDIrsO/k9URAz+7XBmpN8zuOdeuziyD1gMJuOQs/m9N Jmoxn+q+eSyKKMYruQNpjDmTK2DqFSO3j27IQ7vB71sUp1Ce75qAR3eylWdg09V5tK/9 cjzIyyrcvFMWnu+gZkbA5fQk0zpQkvAOXFxbOF1rf0LY6KJtpSLw/UYKd5qZHEnnJaoO rPuIpCF6HP19zJSYufyCh7QZZSQW5wl/mIh19t6uacjx7d04ugGU3iqFa4Y2QICoUNI/ 7wAQ5tNffljLWyFx4Ytgn1M31AWrcarl3aAF9td5Lh4ddiiz1s8z3sUw0O/iK3VbwVyt bw1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MRho6ym8/n7glDorOggjQNgMqNACH9d0SZZCdvsJXcA=; b=fDKB+a22Sz6dUTWz+soFn0YP4Mb6Wi0Dl3KOGdyUO6JYGaa8KuFX1ozGCAWcKFcTPI 0rHvmUBaXdqnFEMtMV0f+zH/yufeqS5W4re9P8ZNAHh0fAPOb921OEmIainuYW+yCwX7 hsaKA7H3d2KYxX8lEEtYu3tkhviIw2e0gwmsRW335/eHG66AwUKBWfXc8ptycHjFwe8W wUianfi0xsMJL/ugAuneslbUgiRAMtOpvkwtBdgMPbag+qOcft02tp6y22EYRjPeaJNR E95Hyce/9fowKiJRLUdp/p3F+4GcU9Swq95v/4hLv4XHclT94bNz5/z/fZxGhtFDMNzm yXdA== X-Gm-Message-State: ANhLgQ2MkiuUI+i5zAQWlJ3XSWL5/wxDe+XShvdzf/WZNG6jthwNfCFQ IKfZJ+/ohwVIPd0TV4zFt34amg== X-Received: by 2002:a1c:2489:: with SMTP id k131mr4653873wmk.86.1585302591454; Fri, 27 Mar 2020 02:49:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p3sm7685088wrj.91.2020.03.27.02.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 02:49:48 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BE7E01FF90; Fri, 27 Mar 2020 09:49:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 4/7] linux-user: more debug for init_guest_space Date: Fri, 27 Mar 2020 09:49:42 +0000 Message-Id: <20200327094945.23768-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327094945.23768-1-alex.bennee@linaro.org> References: <20200327094945.23768-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Searching for memory space can cause problems so lets extend the CPU_LOG_PAGE output so you can watch init_guest_space fail to allocate memory. A more involved fix is actually required to make this function play nicely with the large guard pages the sanitiser likes to use. Signed-off-by: Alex Bennée --- linux-user/elfload.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Laurent Vivier diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 8198be04460..619c054cc48 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2172,6 +2172,8 @@ unsigned long init_guest_space(unsigned long host_start, /* Check to see if the address is valid. */ if (host_start && real_start != current_start) { + qemu_log_mask(CPU_LOG_PAGE, "invalid %lx && %lx != %lx\n", + host_start, real_start, current_start); goto try_again; } @@ -2240,7 +2242,11 @@ unsigned long init_guest_space(unsigned long host_start, * probably a bad strategy if not, which means we got here * because of trouble with ARM commpage setup. */ - munmap((void *)real_start, real_size); + if (munmap((void *)real_start, real_size) != 0) { + error_report("%s: failed to unmap %lx:%lx (%s)", __func__, + real_start, real_size, strerror(errno)); + abort(); + } current_start += align; if (host_start == current_start) { /* Theoretically possible if host doesn't have any suitably From patchwork Fri Mar 27 09:49:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 185002 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1099946ilr; Fri, 27 Mar 2020 02:54:03 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvqYXgOon9CPjq2nAOkGkOMfBqD6Uy1rHr0+Bw2VQjhL2yoAXoGMvyhEa9srkNqSPNyfKIe X-Received: by 2002:a37:6606:: with SMTP id a6mr12697642qkc.364.1585302843260; Fri, 27 Mar 2020 02:54:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585302843; cv=none; d=google.com; s=arc-20160816; b=oxDfZyhelnrB8y90WPDVxuD6zzlkYpvJmtEOzmxiZVmX4bte8cp2rwRPnhq+UVYn+J L2GYQe1ouSGdfRAY3RpiQ88pEpaPXY4NGb9jR279tSrcWrtHKQXHSWQCROeByFiYB3wb 8Toge8KMqhzLyQ3va+VxZCj8wR+CdT2E8MCBqAn8U8O2yBGwN2ZOgP9uyptmtBP+FovR NmDHBs9feXrPDL58YtcBEBH5U/72aHfVyZzbRCGEPszoANA4cVJ3aYL9sdvRL+StK0r9 Uo6B/cSq8FXlzC7uE9/l57RY5gQaU6Z9BH6Lss5nSxtzSqQSqC1uuyr/3I/WJfIHvgYm h4mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=jNCqItbHzWYtJLgrz36pXVxvUTrH1kU9rm8Huuj6L8g=; b=YasdLUuogUC8GTYRZaORq0l4MIncUe/SbdQeIomhdPbHFxSx7kNENFK8V18eTAFEyd ZTNtcsUUOe8Rmb7PkEbCXleCgPw2YQlVBuXWSZIxFtUC9EygdGGNans3tFaKkflCyCow bnliJ9kHP1CZhYCn4Pf9abiovJVg2VORmKKuuFP7uOvDqqLl1eeVN/Z1YUaUySM8t/Vs MIzOus43fJIcyrKmo9sTHtIdFXe9nltoV8nQcz1DvccYWVq3hfdoSJtf6m8U75+rLt+L MyBFkMqTWf2i3McZdIjFKncTJqzQRXhWOhiX0KJnd9eOOpDG4tcVOUyBe2ywZcZHR8s6 uLBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CT2ZEuo6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r10si2968723qtt.277.2020.03.27.02.54.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 02:54:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CT2ZEuo6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlgg-00036g-On for patch@linaro.org; Fri, 27 Mar 2020 05:54:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37935) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlcg-0003VH-W6 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHlcf-0003td-Vl for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:54 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:36541) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHlcf-0003sL-Pj for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:53 -0400 Received: by mail-wm1-x342.google.com with SMTP id g62so11620034wme.1 for ; Fri, 27 Mar 2020 02:49:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jNCqItbHzWYtJLgrz36pXVxvUTrH1kU9rm8Huuj6L8g=; b=CT2ZEuo6RoEOFsURF2XHIcP10MRlgxHe3GY3DaMvXth+dL1nI7B5O0AdnuFaAORhOB 77QULAsvYHNMd3IJDbLiXBdBRS/wzC0c5BDcpv0hz1zi6/u904+WGvdXvJpj50njI4Yr mfuIqR4WyR7zbvlv+kbIaKVhVKtCjxOZdbsWShGX9DjFEuTqgA5gQ0k19m9Z31xAw0A7 AqgWrPREKdy0bYkPK7ti4F+y4lAOYuwVeBLFoNF8VZUU6rT5CQLpkkzfON66g32nGfk/ tbyPgUa4evBMbRz37K6OSu2ilcykE1VzFHC3XKREB+8bFkgS/rCfqGRHqxmhNWuq3hbl hq0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jNCqItbHzWYtJLgrz36pXVxvUTrH1kU9rm8Huuj6L8g=; b=Yfu9jaP3souiCHQHwJr80eHlqV6gErjdrxdh2lO+AzJ3RlUXOO2ulXofDNqVnb6Gis 865FIRNFYalwiNevT9FwXQCuBJqlJ+s3lpDVS74AnKR1H0YwuQ0yotmr4hTVkTaHqWVQ xz29uew+Vmrlb45lTC81Lj1msIceb0yH7JTadhDAtwaPjrpfp4gt5MpaB0YWlJBRj9go 4bXhvIt4ANX2HdYWX4t7V6araAWzN1A016FnwxnA0wNpeE+KpBqhq+J/QOGLnD2d6zDc fkOSxRLGAkEMLC8vgAJTHZY2QB/+E8Rkegov0+Y4tfczgeHplFO/EYPlpO46M2CaAEyB v/9A== X-Gm-Message-State: ANhLgQ0SfC8NBSw2+NutIvKGlz3p2CP8uEgu6I6WT93/9a+Foj6iPLPh x+0AWRlk5II3mhzQbZq1/rxJzQ== X-Received: by 2002:a1c:9693:: with SMTP id y141mr4361799wmd.23.1585302592871; Fri, 27 Mar 2020 02:49:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l12sm7561737wrt.73.2020.03.27.02.49.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 02:49:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D2D8D1FF91; Fri, 27 Mar 2020 09:49:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 5/7] fpu/softfloat: avoid undefined behaviour when normalising empty sigs Date: Fri, 27 Mar 2020 09:49:43 +0000 Message-Id: <20200327094945.23768-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327094945.23768-1-alex.bennee@linaro.org> References: <20200327094945.23768-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The undefined behaviour checker pointed out that a shift of 64 would lead to undefined behaviour. Signed-off-by: Alex Bennée --- fpu/softfloat.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 301ce3b537b..444d35920dd 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -3834,9 +3834,14 @@ void normalizeFloatx80Subnormal(uint64_t aSig, int32_t *zExpPtr, { int8_t shiftCount; - shiftCount = clz64(aSig); - *zSigPtr = aSig< X-Patchwork-Id: 185001 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1099234ilr; Fri, 27 Mar 2020 02:53:12 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv0MImiw1R1fXMuxtf7j1SMYiOriASgep+VK3fgumTDpXoQZpS0AT2Dt/eTJyXV0LW3Qvkq X-Received: by 2002:a37:6807:: with SMTP id d7mr13025959qkc.112.1585302792667; Fri, 27 Mar 2020 02:53:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585302792; cv=none; d=google.com; s=arc-20160816; b=Z3uRA+3LqZNQwkWgutNUOxf4ULNuz6CkyyVxjGHp5XbVXBrzCiUCp8yP0nVSAjYXBe cp9XKn/bIMd8ITQ2+y+4kYJgKQexBeUhXzVUpnurfcvUhNg2X01ak0Nv3ED0uB6o/7PY Q3vvnufzhFjjJAGWqJnlpkO+/XgC8FYiCNmU7maTmlBGt28svOw2QBsF1Y1hrkiH1Slk pF7xs9PRYTG6jMnqMVTKaGXEgBJAIXDIGn7c7GBZYN5RCNVny/dT/WgJHGHP9k+ZS5G9 5fGzKas3ppJIfUqOGuDTreQGa+GcWyaFuXnhhzsetF4U48Qxft7oDhO553mB9DMcOfkd Sj7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=h75bfILekusPXGlQBXuZSQUYvT0dH6xycgkUfP0rfEE=; b=Be7hST5Qc2zWeVlqkzldky/QkHdeJAJuCB2dI6/FkHMbVa/wI/QL/3L/vvYpOJuUce Eg1NzbyUVMvzALxojw2cQhOIzrDKQRLlzVN5pEf2I40ZKcJi3IvBwyPOO/biRWQf2mFL uD+WPDujHX+pEvDmFP7H/x1sK5yDEAo6cAJK+l7o68U2oXFe3RWo3KNJUQCrNOVLwRJc ti4ebnw65D85Lg77UQRHA++EwQjV9MBROMiPmUr5Tswxet1AthAluurmd77fIFR3JPdc EJFTou/OvSc6ckPwq3FrrLQGcj9+z+hFsNFd+QsqR1HEgIfnQ3dgl+lFJSU73OiEAO2d pHNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ePMCx7Jn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m6si572945qvf.209.2020.03.27.02.53.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 02:53:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ePMCx7Jn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlfs-0001I3-4j for patch@linaro.org; Fri, 27 Mar 2020 05:53:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37965) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlci-0003Yk-4n for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHlch-0003wX-0G for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:56 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40321) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHlcg-0003uH-Pz for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:54 -0400 Received: by mail-wm1-x343.google.com with SMTP id a81so11584543wmf.5 for ; Fri, 27 Mar 2020 02:49:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h75bfILekusPXGlQBXuZSQUYvT0dH6xycgkUfP0rfEE=; b=ePMCx7Jnyf+t5ffKVM6T+xLWU8xox/L0YaDLfCiPyBU2/7Tuq2NX1p9JDSqdAcHK4a UHnn+Hwg3H4uh9m2T/KyTasS9pFd9muPsfCtwKBNw2Q+GiOLUIsgoUHbAyDjhaze00az 2+xjDNKuM57bojqqeYx803PAHCU00z59seigOCd8tkvJJev0IxzAAkrQntLshItHt1Th eY4Ql7gYyWB4SCf8IA4uT59ACA4hTdYQOifXGINy2ZDtqB3UFiPt/t0PfxJn4oaOc2bZ 0aD/ju8rLYJtRfTMlKP4BIrcc287T711DIKI6WaD/P3H6j4g6gkQbZBgHBVnZA5lxM5J SUeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h75bfILekusPXGlQBXuZSQUYvT0dH6xycgkUfP0rfEE=; b=ET2pyadbOb9/ISj+cutOHX+fkwOwmPpT1DEPUXYRw09U+NG0Lq7lPyNgd7VP7QP0kj e2cHTTvF59jB6wY1FvYwlnXLBFuJY9QDfAsNCUXY59jg1OfbFw89BOOEOnB2TwgOOkqM WIyRHnlmW2bWAx51CBXIsTlnaBozOb9osvsep6TeA9axPM9UyYswm1QVxaxrjMxbkoDd 8B4sIMxaxjoQeaLzUVIftky61UZLdm7UJ0oqF9LsRCSwdRirm6DJ0GwOK+G1ylapmyUA qNoCGwJooy6VThTz6LD9HYe/+gukzNWWaJNUNSneyQRJZCi4luxyJWGECA5nnZnHLwWs mnIQ== X-Gm-Message-State: ANhLgQ0VtCw+eucqmb4ixilWq7GcBJdebuuAxgEbdLhVhJAIgG2Lkiu4 HUiLPS+RXnCl3wvgnqhTH2eqfoveOg8= X-Received: by 2002:a1c:1fc9:: with SMTP id f192mr4673975wmf.4.1585302593872; Fri, 27 Mar 2020 02:49:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q4sm17123434wmj.1.2020.03.27.02.49.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 02:49:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E7E471FF92; Fri, 27 Mar 2020 09:49:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 6/7] target/xtensa: add FIXME for translation memory leak Date: Fri, 27 Mar 2020 09:49:44 +0000 Message-Id: <20200327094945.23768-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327094945.23768-1-alex.bennee@linaro.org> References: <20200327094945.23768-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Dynamically allocating a new structure within the DisasContext can potentially leak as we can longjmp out of the translation loop (see test_phys_mem). The proper fix would be to use static allocation within the DisasContext but as the Xtensa translator imports it's code from elsewhere I leave that as an exercise for the maintainer. Signed-off-by: Alex Bennée Cc: Max Filippov --- target/xtensa/translate.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.20.1 diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 8aa972cafdf..37f65b1f030 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -1174,6 +1174,11 @@ static void xtensa_tr_init_disas_context(DisasContextBase *dcbase, dc->callinc = ((tb_flags & XTENSA_TBFLAG_CALLINC_MASK) >> XTENSA_TBFLAG_CALLINC_SHIFT); + /* + * FIXME: This will leak when a failed instruction load or similar + * event causes us to longjump out of the translation loop and + * hence not clean-up in xtensa_tr_tb_stop + */ if (dc->config->isa) { dc->insnbuf = xtensa_insnbuf_alloc(dc->config->isa); dc->slotbuf = xtensa_insnbuf_alloc(dc->config->isa); From patchwork Fri Mar 27 09:49:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 185003 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1100296ilr; Fri, 27 Mar 2020 02:54:31 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuXCM8mp+pZ90BQDjDJkXenrWemZXLYPxHvy/e7s6di5N3sDHXh6YCaqiV0sb/S0lEaN8m6 X-Received: by 2002:a37:67c4:: with SMTP id b187mr12903815qkc.209.1585302871810; Fri, 27 Mar 2020 02:54:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585302871; cv=none; d=google.com; s=arc-20160816; b=q77DgtYcc91yIBIZ8YHLCV9ZRtqJzaY37Vt5wDHpKRgq9Qa6Yfc2pwOFmCBMGADgI4 BJHAFHOm7/OLB1wbjoMu33akC+omNgoFMwMU3msCsawKAl9qHY2DyKn9lY/0CZNewbGj A6Ww1pzdIwBTIkuph1BmZ3hEpRx95Jbx9Ien+aST59P3o/L5CDPv/ep2R87mggdeSaFT k49JB2pfJgXx64s7mV+3oiVbmNZqWWTDEasPWrwYk0nU5jU50XPM5TOBcS/j6kkhTqfA tjMIAP0v3tLiAL/gkSGrkiHx3BY+aPK581L51YANqVsU1GSbaHhyBjqlYgb84vrxNJdp 72+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=SKd+3bU+Rf4qaLer/lKG48RI5FY7mtn7Z+QzafPJnHc=; b=e3uAP7abI0fKnfTxR0o7/cKdg6U12tzQnhYGhIr53IXA+yTm2so4+gxpnda90OItlA ytY2zHJ83jryjp1p/xwniyw+HsEpcHq17mSzl1JwRDMHP+FkleZ1HP08FBPSipLUsecU M+oS5rpvsSuDPMizboN0z2pmjEDf7NnuMmlWOX3fVdgbGr5h6JSxWa+Qrbf8tojLnywu +EBmBNPdxx62p5qm2dGwTxRDFmdjfXtv+ZRyvy3y8EDaXEvMDfKkLPdyuoVug9zkPiaM cj+Bg2MeQtPl5as/VwEtYki/0voAYGrodzcxBEnVDJZYbMMHkTgir7lfDJl+lsYqlAEC czJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qY4bcVoy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id cw5si1794174qvb.169.2020.03.27.02.54.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 02:54:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qY4bcVoy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlh9-0003eF-At for patch@linaro.org; Fri, 27 Mar 2020 05:54:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37998) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHlcj-0003br-4z for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:50:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHlci-00042H-3K for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:57 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35621) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHlch-0003yI-SX for qemu-devel@nongnu.org; Fri, 27 Mar 2020 05:49:56 -0400 Received: by mail-wm1-x32f.google.com with SMTP id f74so628370wmf.0 for ; Fri, 27 Mar 2020 02:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SKd+3bU+Rf4qaLer/lKG48RI5FY7mtn7Z+QzafPJnHc=; b=qY4bcVoyrj9UDssxhyjuqXC8vq/MDVYm4Kco8WPuCa/1FRA85vfW9FYoirvRCf2oXk jnJJZjHeFz/QuhpvzYhy36xET487i6LD7Q3OfqxjL0Y5RGK+942BGBeu2Om4ymN3qYAb ZYMBATi67tTUzBhpnZMFFEpXsoIl3d9NfnfInFgwWih0IF0Zkl2ZSKRKUuBdiPRZ6jru 3faOd72M7bFrhKH+qjgj8HxF7iq+k/NB2A4q2qMlbELf6Eq7vtR67PCJ6+5UjJH3q/cC idk77TwsUBLHW5hVTLEJoaPlEUcaMK22rbrlC9fLMq8rKdjxgRX3TG2ARvxS2qlVVFkj s+GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SKd+3bU+Rf4qaLer/lKG48RI5FY7mtn7Z+QzafPJnHc=; b=Olpe8WETV7D7/5mUmyq1lw4tDgSdbsMjJSFRmW73wAbo8pqb8xEJAuu6e3GO6hF+QL f71rJ/JjMyLSDs5a0dE9fMfuw//3M4q7IOnJr9lK98m4+w403dYhOzaqLoxCaxOoHCBW 2LFI0KIdjlnje8TOnfIYV/4RMtlXckep2zzeN+mk6eUukKXs7LTZoTHLyQk1P3m3JCVa D1M2ZrM6KTNmfcI0Yl+jejbCgQItR+ctgA5diJGo7c6+0tDW3Hzho/JeHSTK1d6zsg9l MXf3+3u91mXdACBcv3/LnYAgtfKg6xsZe6BnaE21kiAmIHlWhYEF52ijAQof30JkFjrX wsgg== X-Gm-Message-State: ANhLgQ1pTQPiROgMh0NjkNZbYyipir9WBlDojhgk+ohlVgJTvVR8zoJr bZBpabGiKnigc2q4oOxs5i2S8A== X-Received: by 2002:a1c:1bd2:: with SMTP id b201mr896464wmb.181.1585302594857; Fri, 27 Mar 2020 02:49:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y200sm7431526wmc.20.2020.03.27.02.49.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 02:49:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 07A491FF93; Fri, 27 Mar 2020 09:49:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 7/7] gdbstub: fix compiler complaining Date: Fri, 27 Mar 2020 09:49:45 +0000 Message-Id: <20200327094945.23768-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327094945.23768-1-alex.bennee@linaro.org> References: <20200327094945.23768-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Denis Plotnikov , Euler Robot , Chen Qun , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Denis Plotnikov ./gdbstub.c: In function ‘handle_query_thread_extra’: /usr/include/glib-2.0/glib/glib-autocleanups.h:28:10: error: ‘cpu_name’ may be used uninitialized in this function [-Werror=maybe-uninitialized] g_free (*pp); ^ ./gdbstub.c:2063:26: note: ‘cpu_name’ was declared here g_autofree char *cpu_name; ^ cc1: all warnings being treated as errors Signed-off-by: Denis Plotnikov Message-Id: <20200326151407.25046-1-dplotnikov@virtuozzo.com> Reported-by: Euler Robot Reported-by: Chen Qun Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- gdbstub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/gdbstub.c b/gdbstub.c index 013fb1ac0f1..171e1509509 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2060,8 +2060,8 @@ static void handle_query_thread_extra(GdbCmdContext *gdb_ctx, void *user_ctx) /* Print the CPU model and name in multiprocess mode */ ObjectClass *oc = object_get_class(OBJECT(cpu)); const char *cpu_model = object_class_get_name(oc); - g_autofree char *cpu_name; - cpu_name = object_get_canonical_path_component(OBJECT(cpu)); + g_autofree char *cpu_name = + object_get_canonical_path_component(OBJECT(cpu)); g_string_printf(rs, "%s %s [%s]", cpu_model, cpu_name, cpu->halted ? "halted " : "running"); } else {