From nobody Wed May 8 09:33:20 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623409198535713.2267421596589; Fri, 11 Jun 2021 03:59:58 -0700 (PDT) Received: from localhost ([::1]:35118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lretJ-00014W-Ix for importer2@patchew.org; Fri, 11 Jun 2021 06:59:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lresU-0000D3-93; Fri, 11 Jun 2021 06:59:06 -0400 Received: from mail.weilnetz.de ([37.120.169.71]:43196 helo=mail.v2201612906741603.powersrv.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lresR-00069b-VL; Fri, 11 Jun 2021 06:59:05 -0400 Received: from qemu.weilnetz.de (qemu.weilnetz.de [188.68.58.204]) by mail.v2201612906741603.powersrv.de (Postfix) with ESMTP id 1938BDA07C2; Fri, 11 Jun 2021 12:59:00 +0200 (CEST) Received: by qemu.weilnetz.de (Postfix, from userid 1000) id 8D5C3460056; Fri, 11 Jun 2021 12:58:59 +0200 (CEST) From: Stefan Weil To: qemu-devel@nongnu.org Subject: [PATCH] util/oslib-win32: Fix fatal assertion in qemu_try_memalign Date: Fri, 11 Jun 2021 12:58:46 +0200 Message-Id: <20210611105846.347954-1-sw@weilnetz.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=37.120.169.71; envelope-from=stefan@weilnetz.de; helo=mail.v2201612906741603.powersrv.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: qemu-trivial@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The function is called with alignment =3D=3D 0 which caused an assertion. Use the code from oslib_posix.c to fix that regression (introduced by commit ed6f53f9ca9). Signed-off-by: Stefan Weil Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- util/oslib-win32.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/util/oslib-win32.c b/util/oslib-win32.c index ca99356fdf..7b318ea835 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -57,7 +57,11 @@ void *qemu_try_memalign(size_t alignment, size_t size) void *ptr; =20 g_assert(size !=3D 0); - g_assert(is_power_of_2(alignment)); + if (alignment < sizeof(void *)) { + alignment =3D sizeof(void *); + } else { + g_assert(is_power_of_2(alignment)); + } ptr =3D _aligned_malloc(size, alignment); trace_qemu_memalign(alignment, size, ptr); return ptr; --=20 2.30.2