From nobody Thu Apr 10 22:10:11 2025 Delivered-To: importer@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+importer=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 167576463944087.62512088500284; Tue, 7 Feb 2023 02:10:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPKuB-0000gG-EQ; Tue, 07 Feb 2023 05:08:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPKu7-0000ZJ-Bu; Tue, 07 Feb 2023 05:08:47 -0500 Received: from gandalf.ozlabs.org ([150.107.74.76]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPKu2-0002UP-1y; Tue, 07 Feb 2023 05:08:45 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4P9zNn0YHPz4xyd; Tue, 7 Feb 2023 21:08:41 +1100 (AEDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4P9zNl0QT4z4xyB; Tue, 7 Feb 2023 21:08:38 +1100 (AEDT) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Delevoryas , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 18/25] hw/misc/aspeed_hace: Do not crash if address_space_map() failed Date: Tue, 7 Feb 2023 11:07:37 +0100 Message-Id: <20230207100744.698694-19-clg@kaod.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230207100744.698694-1-clg@kaod.org> References: <20230207100744.698694-1-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=150.107.74.76; envelope-from=SRS0=a43c=6D=kaod.org=clg@ozlabs.org; helo=gandalf.ozlabs.org X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1675764639650100001 From: Philippe Mathieu-Daud=C3=A9 address_space_map() can fail: uart:~$ hash test sha256_test tv[0]: Segmentation fault: 11 Thread 3 "qemu-system-arm" received signal SIGSEGV, Segmentation fault. gen_acc_mode_iov (req_len=3D0x7ffff18b7778, id=3D, iov=3D0= x7ffff18b7780, s=3D0x555556ce0bd0) at ../hw/misc/aspeed_hace.c:171 171 if (has_padding(s, &iov[id], *req_len, &total_msg_len, &pad_o= ffset)) { (gdb) bt #0 gen_acc_mode_iov (req_len=3D0x7ffff18b7778, id=3D, iov= =3D0x7ffff18b7780, s=3D0x555556ce0bd0) at ../hw/misc/aspeed_hace.c:171 #1 do_hash_operation (s=3Ds@entry=3D0x555556ce0bd0, algo=3D3, sg_mode=3D= sg_mode@entry=3Dtrue, acc_mode=3Dacc_mode@entry=3Dtrue) at ../hw/misc/aspeed_hace.c:224 #2 0x00005555559bdbb8 in aspeed_hace_write (opaque=3D, ad= dr=3D12, data=3D262488, size=3D) at ../hw/misc/aspeed_hace.c:358 This change doesn't fix much, but at least the guest can't crash QEMU anymore. Instead it is still usable: uart:~$ hash test sha256_test tv[0]:hash_final error sha384_test tv[0]:hash_final error sha512_test tv[0]:hash_final error [00:00:06.278,000] hace_global: HACE poll timeout [00:00:09.324,000] hace_global: HACE poll timeout [00:00:12.261,000] hace_global: HACE poll timeout uart:~$ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Delevoryas Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: C=C3=A9dric Le Goater --- hw/misc/aspeed_hace.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c index ac21be306c..12a761f1f5 100644 --- a/hw/misc/aspeed_hace.c +++ b/hw/misc/aspeed_hace.c @@ -193,6 +193,7 @@ static void do_hash_operation(AspeedHACEState *s, int a= lgo, bool sg_mode, size_t digest_len =3D 0; int niov =3D 0; int i; + void *haddr; =20 if (sg_mode) { uint32_t len =3D 0; @@ -217,9 +218,13 @@ static void do_hash_operation(AspeedHACEState *s, int = algo, bool sg_mode, addr &=3D SG_LIST_ADDR_MASK; =20 plen =3D len & SG_LIST_LEN_MASK; - iov[i].iov_base =3D address_space_map(&s->dram_as, addr, &plen= , false, - MEMTXATTRS_UNSPECIFIED); - + haddr =3D address_space_map(&s->dram_as, addr, &plen, false, + MEMTXATTRS_UNSPECIFIED); + if (haddr =3D=3D NULL) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: qcrypto failed\n", __f= unc__); + return; + } + iov[i].iov_base =3D haddr; if (acc_mode) { niov =3D gen_acc_mode_iov(s, iov, i, &plen); =20 @@ -230,10 +235,14 @@ static void do_hash_operation(AspeedHACEState *s, int= algo, bool sg_mode, } else { hwaddr len =3D s->regs[R_HASH_SRC_LEN]; =20 + haddr =3D address_space_map(&s->dram_as, s->regs[R_HASH_SRC], + &len, false, MEMTXATTRS_UNSPECIFIED); + if (haddr =3D=3D NULL) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: qcrypto failed\n", __func_= _); + return; + } + iov[0].iov_base =3D haddr; iov[0].iov_len =3D len; - iov[0].iov_base =3D address_space_map(&s->dram_as, s->regs[R_HASH_= SRC], - &len, false, - MEMTXATTRS_UNSPECIFIED); i =3D 1; =20 if (s->iov_count) { --=20 2.39.1