From patchwork Fri Dec 30 11:34:58 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: 637867 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3359461pvb; Fri, 30 Dec 2022 03:37:24 -0800 (PST) X-Google-Smtp-Source: AMrXdXtrlhpoJJgPx0X0YSmo477sC4JHr4QR7zUC21B/CyhOxW6coUe/JYQWcitGrrhXZK7X2tDF X-Received: by 2002:a0c:f444:0:b0:4c7:7a7e:805f with SMTP id h4-20020a0cf444000000b004c77a7e805fmr44856430qvm.3.1672400244748; Fri, 30 Dec 2022 03:37:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672400244; cv=none; d=google.com; s=arc-20160816; b=ItJKgOGqC+3MO6RCNz6/dba1V3kNdaAOFIIAzJ7u5oNzTz5Fw/0Enlo/3zfJelT3qx mQU4KJwlp1FtBIyBjVBuWQs6dQeAlCnyyJADZ7zDj0xefn53C8amb5Wp0EJoB642GgGA K9bjNQgjtmyXCLApMbAhiMG/NJd5YmSWpb1Mk07+6SywqO0nwwROYrIYIKHTX4J8jVFT u0yTa5nQIiqA6Fs7rQsfFV8Xrp45L7F4tWQCvTm8hAlwdssDL6vR9mOnzCS4pS4UAugt /JDbUWTEt5HPqH+B7mVm7QySUn6RBG60e39fbmPPqZgnYmoJaZzz+HHBKo3VdNkholt2 AakQ== 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=Se9+ZKwl8LvQU91mt3B0+Vzbdjcyd4fnlDtudgozX50=; b=GfcQGs8wYjqsAb2/0aXEWD0TT8+UTxVMmYWAYZX6MiZP0KO6ft02mpwlwh2dYA1pgc ELHWWiUKfvKN/PW1EzkwoBAPNFqwi0APQ28gLWtgOpfsw8g5udP0AYHD5ySVdbU8oE7j R/6hnYUbdvFkWhwyOP4MFruImHAupEOprAq3z45j3LA5zAadnKn1huT4FM+zYN2vM3An 6vkcgHYcx9dw4ApMloPHaICafR7nk2FgmJ6ZnGww9LJle3OtKn/0TJZz4HvZtA8al3jd +8d4D0UDkGiQmvdiqW0VMi1DaOy4T7TMhLWJbCxJuRV5ap7jy1XgyVcfF5u8jtWlWyhv NWPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R1gIu1qQ; 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 j9-20020a05621419c900b005317c35bb60si8008670qvc.88.2022.12.30.03.37.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Dec 2022 03:37:24 -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=R1gIu1qQ; 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 1pBDfn-0006LY-OO; Fri, 30 Dec 2022 06:35:39 -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 1pBDfl-0006JV-Pq for qemu-devel@nongnu.org; Fri, 30 Dec 2022 06:35:37 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pBDfj-0003sg-T6 for qemu-devel@nongnu.org; Fri, 30 Dec 2022 06:35:37 -0500 Received: by mail-wm1-x32a.google.com with SMTP id l26so13438192wme.5 for ; Fri, 30 Dec 2022 03:35:35 -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=Se9+ZKwl8LvQU91mt3B0+Vzbdjcyd4fnlDtudgozX50=; b=R1gIu1qQ4ygNvGTJQj4UXSMGrzZ5TeJ+asqISnoBt5UhtlIXM7CRpWD6zQbli4WttM reBND4JBkpagJR9Wz02gUTlxial+F/su9IuAJHEi4Q1V0B9fVjVvZA6wu3bbjBf3OlwY vWtA5PoHBpbjVtcX9Asf9D5AMEhpVI2rFBv2hZQEVVrV+31Hrc4pG3HlngD+Pk6I9B6b 8Ro6EopBzO8RzxKX62+iqoSS0T0hE6lE8gwFBRrPWJ3rpGDa3j2oFaUTytrwGZFk6hMl hkMSSMcNy6g928zg6UQaqsFZGcQJz2l4MJkTmdmRJ1OkFukEVAXIV+SRepPKTL1MTjIL qycw== 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=Se9+ZKwl8LvQU91mt3B0+Vzbdjcyd4fnlDtudgozX50=; b=eyiXbvNFdzhAvQSX+r7+t1B6gyfWuGHUKeSvfByqPhME8zxtLclkDeKn5GwJNAs10V vt+f6CjagelLoke3bkRqOJTsnD81tfSUvk7bhIJv9Y/Lmb5JoZolJUC0R9SOqXpGyFEI joAc1rAXNs54EttIj40AzL9xscNSxWv68BxssoJt5miQ4184E8p8esVi40MjF9glPovI RyjuBZv0y8zsU5oPzgOgRFoXy8aHIs4UG1hcC3kV3QuS5FswNCrFM4B0mVICk5gt892c jUcgqHVHOAtuOgECIx0P+UFc2akwywa67dYxg25PwKSmK6+AtlfWfRo4cMtJLbRCbtoP hWNA== X-Gm-Message-State: AFqh2krMI2LiQWFGiOplsYbLzPtn+LBXyf619Y6VCHhO0TqGsCVwiZQF unthLffpZNV5jlM3tVQrmCD8+rrQcyi8cc4J X-Received: by 2002:a05:600c:34ce:b0:3cf:614e:b587 with SMTP id d14-20020a05600c34ce00b003cf614eb587mr23792723wmq.26.1672400134502; Fri, 30 Dec 2022 03:35:34 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id a21-20020a1cf015000000b003d070e45574sm27619829wmb.11.2022.12.30.03.35.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 30 Dec 2022 03:35:34 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Joel Stanley , Troy Lee , Beraldo Leal , Peter Maydell , Wainer dos Santos Moschetta , Andrew Jeffery , Chin-Ting Kuo , Peter Delevoryas , Steven Lee , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jamin Lin , Peter Delevoryas , Peter Delevoryas , qemu-arm@nongnu.org, =?utf-8?q?C=C3=A9dri?= =?utf-8?q?c_Le_Goater?= , Cleber Rosa Subject: [PATCH v2 05/11] hw/misc/aspeed_hace: Do not crash if address_space_map() failed Date: Fri, 30 Dec 2022 12:34:58 +0100 Message-Id: <20221230113504.37032-6-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221230113504.37032-1-philmd@linaro.org> References: <20221230113504.37032-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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 Reviewed-by: Cédric 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 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) {