Skip to content

Commit ed5d977

Browse files
philmdlegoater
authored andcommitted
hw/misc/aspeed_hace: Do not crash if address_space_map() failed
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 espressif#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é <[email protected]> Reviewed-by: Peter Delevoryas <[email protected]> Reviewed-by: Cédric Le Goater <[email protected]> Signed-off-by: Cédric Le Goater <[email protected]>
1 parent f8ad895 commit ed5d977

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

hw/misc/aspeed_hace.c

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode,
193193
size_t digest_len = 0;
194194
int niov = 0;
195195
int i;
196+
void *haddr;
196197

197198
if (sg_mode) {
198199
uint32_t len = 0;
@@ -217,9 +218,13 @@ static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode,
217218
addr &= SG_LIST_ADDR_MASK;
218219

219220
plen = len & SG_LIST_LEN_MASK;
220-
iov[i].iov_base = address_space_map(&s->dram_as, addr, &plen, false,
221-
MEMTXATTRS_UNSPECIFIED);
222-
221+
haddr = address_space_map(&s->dram_as, addr, &plen, false,
222+
MEMTXATTRS_UNSPECIFIED);
223+
if (haddr == NULL) {
224+
qemu_log_mask(LOG_GUEST_ERROR, "%s: qcrypto failed\n", __func__);
225+
return;
226+
}
227+
iov[i].iov_base = haddr;
223228
if (acc_mode) {
224229
niov = gen_acc_mode_iov(s, iov, i, &plen);
225230

@@ -230,10 +235,14 @@ static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode,
230235
} else {
231236
hwaddr len = s->regs[R_HASH_SRC_LEN];
232237

238+
haddr = address_space_map(&s->dram_as, s->regs[R_HASH_SRC],
239+
&len, false, MEMTXATTRS_UNSPECIFIED);
240+
if (haddr == NULL) {
241+
qemu_log_mask(LOG_GUEST_ERROR, "%s: qcrypto failed\n", __func__);
242+
return;
243+
}
244+
iov[0].iov_base = haddr;
233245
iov[0].iov_len = len;
234-
iov[0].iov_base = address_space_map(&s->dram_as, s->regs[R_HASH_SRC],
235-
&len, false,
236-
MEMTXATTRS_UNSPECIFIED);
237246
i = 1;
238247

239248
if (s->iov_count) {

0 commit comments

Comments
 (0)