From patchwork Thu Dec 29 15:23:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 637564 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2985018pvb; Thu, 29 Dec 2022 07:26:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXsWBMYMcXVt99kBdXPx6/DLhVrA5OmLf/urhCjUzgPkcMhiZJnpCXfjm91bIVZ1b3w61Dhp X-Received: by 2002:ac8:690d:0:b0:3a8:ef7:f29c with SMTP id bt13-20020ac8690d000000b003a80ef7f29cmr39560399qtb.46.1672327618676; Thu, 29 Dec 2022 07:26:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672327618; cv=none; d=google.com; s=arc-20160816; b=awtgUa04o3RlPKstjIiHxnZKucuO8H5qrwWfleshEl6j/kcW85J5gUeNCh0R1+9TwU HNV9BmY1/0nP7+W0wOaDRzUlnTCGNsLJ5nXoP31+osqLg4MssdtWU/4cnxJRP9E6qRJh YOxtreEDUHGoO4mTQh6Lr7zuuZ7+UpIMq5OcTb2k2CON1VR8RmihEN167roa+mZQM7O3 sE85sENqxVAWAs8Es+YQQB58xQvk4TbNIPIRGh89MMO6USODt+5Jp7oFTg4KUNGJgp3f vJJUlJYXSphLzl9bpRvEPcujCyH6JLDWiz8vyrOKnxRs9jnCn6Mv0NVbWaJQCcUSxBjF arhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=y0SRe0Kx73w/5k1isHeaGbaMhDnp0SdPMUGkYoUAYuM=; b=WY6GVDi/K1pYfgVyOG6IIe7609PIl2Nu5Id+5DpA1go9R4nR7sN9JJgWdiQzixi++5 D4jlOUCgIwNcIr9DdzltAWtk+BDBJDZZFPusAohS54Bd9zsteyUM80U0WycfwI6VMSky BZAP0FGTUIQzDtuzSCMi50gLjae0YPKqXYivkO4CH088+l9vGP6cONVVkMYL/QMBy+82 ToSdFFezCK/6S1shIPDy61opsSqerlIiLNfxZ0vKRGd/aZEK/ibNo+3mqVrjwyze6pxW a+UOQ+u7WEiBP1AXvnMwa97on+u9rV/29YNc0OZFygEp0gckiAD2cU6TAaITk14Vc4vX UPEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EFbsYvbt; 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 d18-20020ac85452000000b003a7e9e92b99si8299039qtq.263.2022.12.29.07.26.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Dec 2022 07:26:58 -0800 (PST) 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=EFbsYvbt; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAulR-0001M6-SU; Thu, 29 Dec 2022 10:24:13 -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 1pAulQ-0001LT-Cv for qemu-devel@nongnu.org; Thu, 29 Dec 2022 10:24:12 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAulN-0007yF-AS for qemu-devel@nongnu.org; Thu, 29 Dec 2022 10:24:11 -0500 Received: by mail-wm1-x331.google.com with SMTP id bg10so13358267wmb.1 for ; Thu, 29 Dec 2022 07:24:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y0SRe0Kx73w/5k1isHeaGbaMhDnp0SdPMUGkYoUAYuM=; b=EFbsYvbtxuYDzfQPU3B3TXKY7DpVt3rVXi7GjVzdOHdeeLdy//12PPfbZ8Xm5hEJNp Bk0wfDIOxeudErO5OMFZv3+TOVcWY1Ut2SQDROADYwAv2NVfST5/Im++jCDLICOpj6fu AutsECPsGtXp/0dlKK5hsnxzfVOZFlIX3OFmzgusWyOI7fPs53cAtwPCwCBMmBgTsTZF v+aIny1ZXP2B1nit830t+fa9ib+KOGeCsqBpHVRkNGrc3pPl0MUghj/LA03n/HUrKTup nbsxSwhpy8EVECB1GFI5saO+TsJEa/IKis00jjSaG8jPlsW6+oimr3eJfBDqCyuRScG5 ksYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y0SRe0Kx73w/5k1isHeaGbaMhDnp0SdPMUGkYoUAYuM=; b=6+ptXClB7c8GNKkyd44MmSPm1sgYqHoNnXy6LmKDMe6j007//yaai85/BDdGDVBkV8 HMO6tEsYAumK8/dsUeyGqbVutlVrf0ozFVHcput14mY7QfFOOnXmoC3X/AvWuvsaz0b/ U8+/bZBCbdeK79AXe0likSlYqOZnHTl+ELRYlfleh0omblVYjNGo9u9qhsInUTE4ORrI 47iuDf6t/5mqKFk3QI2ophhjn2QREdMx356nh4IBlIyE0kmbYckl3DZlPFmLLOFdhy0j PWroM0PhwksP6UBRdk003P58O/i8ZBeuIbRPtoYdPzavNfOcnJmeDKr5anFERzqD2LBe 30zg== X-Gm-Message-State: AFqh2kooDYl84nv74vp7BqaVRzcHnKQnQsOegXD35fbs9Y0/oQLJmxmh vCyXAoF8hBsg/M6oU+rmntlHffJxdGL/s0Xl X-Received: by 2002:a05:600c:18a1:b0:3d2:3ec4:7eed with SMTP id x33-20020a05600c18a100b003d23ec47eedmr23502758wmp.10.1672327447927; Thu, 29 Dec 2022 07:24:07 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id h14-20020a05600c314e00b003d237d60318sm27062702wmo.2.2022.12.29.07.24.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 29 Dec 2022 07:24:07 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Peter Delevoryas , Peter Delevoryas , qemu-arm@nongnu.org, Cleber Rosa , Peter Maydell , Beraldo Leal , Wainer dos Santos Moschetta , Troy Lee , Andrew Jeffery , Joel Stanley , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Peter Delevoryas , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jamin Lin Subject: [PATCH 7/9] hw/misc/aspeed_hace: Do not crash if address_space_map() failed Date: Thu, 29 Dec 2022 16:23:23 +0100 Message-Id: <20221229152325.32041-8-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221229152325.32041-1-philmd@linaro.org> References: <20221229152325.32041-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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=0x7ffff18b7778, id=, iov=0x7ffff18b7780, s=0x555556ce0bd0) at ../hw/misc/aspeed_hace.c:171 171 if (has_padding(s, &iov[id], *req_len, &total_msg_len, &pad_offset)) { (gdb) bt #0 gen_acc_mode_iov (req_len=0x7ffff18b7778, id=, iov=0x7ffff18b7780, s=0x555556ce0bd0) at ../hw/misc/aspeed_hace.c:171 #1 do_hash_operation (s=s@entry=0x555556ce0bd0, algo=3, sg_mode=sg_mode@entry=true, acc_mode=acc_mode@entry=true) at ../hw/misc/aspeed_hace.c:224 #2 0x00005555559bdbb8 in aspeed_hace_write (opaque=, addr=12, data=262488, size=) 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é Reviewed-by: Peter Delevoryas --- 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 algo, bool sg_mode, size_t digest_len = 0; int niov = 0; int i; + void *haddr; if (sg_mode) { uint32_t len = 0; @@ -217,9 +218,13 @@ static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode, addr &= SG_LIST_ADDR_MASK; plen = len & SG_LIST_LEN_MASK; - iov[i].iov_base = address_space_map(&s->dram_as, addr, &plen, false, - MEMTXATTRS_UNSPECIFIED); - + haddr = address_space_map(&s->dram_as, addr, &plen, false, + MEMTXATTRS_UNSPECIFIED); + if (haddr == NULL) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: qcrypto failed\n", __func__); + return; + } + iov[i].iov_base = haddr; if (acc_mode) { niov = gen_acc_mode_iov(s, iov, i, &plen); @@ -230,10 +235,14 @@ static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode, } else { hwaddr len = s->regs[R_HASH_SRC_LEN]; + haddr = address_space_map(&s->dram_as, s->regs[R_HASH_SRC], + &len, false, MEMTXATTRS_UNSPECIFIED); + if (haddr == NULL) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: qcrypto failed\n", __func__); + return; + } + iov[0].iov_base = haddr; iov[0].iov_len = len; - iov[0].iov_base = address_space_map(&s->dram_as, s->regs[R_HASH_SRC], - &len, false, - MEMTXATTRS_UNSPECIFIED); i = 1; if (s->iov_count) {