From: "Cédric Le Goater" <clg@kaod.org>
To: "Philippe Mathieu-Daudé" <philmd@linaro.org>, qemu-devel@nongnu.org
Cc: Joel Stanley <joel@jms.id.au>, Troy Lee <troy_lee@aspeedtech.com>,
Beraldo Leal <bleal@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Wainer dos Santos Moschetta <wainersm@redhat.com>,
Andrew Jeffery <andrew@aj.id.au>,
Chin-Ting Kuo <chin-ting_kuo@aspeedtech.com>,
Peter Delevoryas <peter@pjd.dev>,
Steven Lee <steven_lee@aspeedtech.com>,
Jamin Lin <jamin_lin@aspeedtech.com>,
Peter Delevoryas <pdel@fb.com>, Peter Delevoryas <pdel@meta.com>,
<qemu-arm@nongnu.org>, Cleber Rosa <crosa@redhat.com>
Subject: Re: [PATCH v2 05/11] hw/misc/aspeed_hace: Do not crash if address_space_map() failed
Date: Mon, 2 Jan 2023 14:37:35 +0100 [thread overview]
Message-ID: <ab91bfcd-2f5e-9db5-db05-e100c2b95779@kaod.org> (raw)
In-Reply-To: <20221230113504.37032-6-philmd@linaro.org>
On 12/30/22 12:34, Philippe Mathieu-Daudé wrote:
> 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=<optimized out>, 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=<optimized out>, 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=<optimized out>, addr=12, data=262488, size=<optimized out>)
> 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] <err> hace_global: HACE poll timeout
> [00:00:09.324,000] <err> hace_global: HACE poll timeout
> [00:00:12.261,000] <err> hace_global: HACE poll timeout
> uart:~$
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Peter Delevoryas <peter@pjd.dev>
This is a tough model. I am glad you are taking a look at it.
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> ---
> 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) {
next prev parent reply other threads:[~2023-01-02 13:37 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-30 11:34 [PATCH v2 00/11] hw/arm/aspeed_ast10x0: Map more peripherals & few more fixes Philippe Mathieu-Daudé
2022-12-30 11:34 ` [PATCH v2 01/11] hw/watchdog/wdt_aspeed: Rename MMIO region size as 'iosize' Philippe Mathieu-Daudé
2022-12-31 22:43 ` Dong, Eddie
2023-01-02 12:30 ` Cédric Le Goater
2023-01-18 8:46 ` Cédric Le Goater
2023-01-03 15:25 ` Peter Delevoryas
2022-12-30 11:34 ` [PATCH v2 02/11] hw/watchdog/wdt_aspeed: Extend MMIO range to cover more registers Philippe Mathieu-Daudé
2022-12-30 12:31 ` Philippe Mathieu-Daudé
2022-12-30 18:31 ` Peter Delevoryas
2022-12-31 22:52 ` Dong, Eddie
2023-01-02 10:05 ` Philippe Mathieu-Daudé
2023-01-02 13:31 ` Cédric Le Goater
2023-01-03 15:31 ` Peter Delevoryas
2023-01-03 15:48 ` Cédric Le Goater
2023-01-03 15:52 ` Peter Delevoryas
2023-01-18 8:48 ` Cédric Le Goater
2022-12-30 11:34 ` [PATCH v2 03/11] hw/watchdog/wdt_aspeed: Log unimplemented registers as UNIMP level Philippe Mathieu-Daudé
2022-12-30 18:29 ` Peter Delevoryas
2023-01-02 13:35 ` Cédric Le Goater
2022-12-30 11:34 ` [PATCH v2 04/11] hw/arm/aspeed: Use the IEC binary prefix definitions Philippe Mathieu-Daudé
2023-01-02 13:36 ` Cédric Le Goater
2023-01-18 6:53 ` Joel Stanley
2023-01-18 7:32 ` Cédric Le Goater
2023-01-18 8:37 ` Philippe Mathieu-Daudé
2023-01-18 8:43 ` Cédric Le Goater
2022-12-30 11:34 ` [PATCH v2 05/11] hw/misc/aspeed_hace: Do not crash if address_space_map() failed Philippe Mathieu-Daudé
2023-01-02 13:37 ` Cédric Le Goater [this message]
2022-12-30 11:34 ` [PATCH v2 06/11] hw/arm/aspeed_ast10x0: Add various unimplemented peripherals Philippe Mathieu-Daudé
2023-01-02 13:38 ` Cédric Le Goater
2022-12-30 11:35 ` [PATCH v2 07/11] hw/arm/aspeed_ast10x0: Map I3C peripheral Philippe Mathieu-Daudé
2023-01-02 13:40 ` Cédric Le Goater
2022-12-30 11:35 ` [PATCH v2 08/11] hw/arm/aspeed_ast10x0: Map the secure SRAM Philippe Mathieu-Daudé
2023-01-02 13:17 ` Cédric Le Goater
2022-12-30 11:35 ` [PATCH v2 09/11] hw/arm/aspeed_ast10x0: Map HACE peripheral Philippe Mathieu-Daudé
2023-01-02 14:07 ` Cédric Le Goater
2022-12-30 11:35 ` [PATCH v2 10/11] hw/arm/aspeed_ast10x0: Add TODO comment to use Cortex-M4F Philippe Mathieu-Daudé
2023-01-02 13:45 ` Cédric Le Goater
2022-12-30 11:35 ` [PATCH v2 11/11] tests/avocado: Test Aspeed Zephyr SDK v00.01.08 on AST1030 board Philippe Mathieu-Daudé
2023-01-02 13:46 ` Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ab91bfcd-2f5e-9db5-db05-e100c2b95779@kaod.org \
--to=clg@kaod.org \
--cc=andrew@aj.id.au \
--cc=bleal@redhat.com \
--cc=chin-ting_kuo@aspeedtech.com \
--cc=crosa@redhat.com \
--cc=jamin_lin@aspeedtech.com \
--cc=joel@jms.id.au \
--cc=pdel@fb.com \
--cc=pdel@meta.com \
--cc=peter.maydell@linaro.org \
--cc=peter@pjd.dev \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=steven_lee@aspeedtech.com \
--cc=troy_lee@aspeedtech.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).