SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fuzz: fix writing DMA patterns

Browse Source 
This code had all sorts of issues. We used a loop similar to
address_space_write_rom, but I did not remove a "break" that only made
sense in the context of the switch statement in the original code. Then,
after the loop, we did a separate qtest_memwrite over the entire DMA
access range, defeating the purpose of the loop. Additionally, we
increment the buf pointer, and then try to g_free() it. Fix these
problems.

Reported-by: OSS-Fuzz (Issue 26725)
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reported-by: OSS-Fuzz (Issue 26691)
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-Id: <20201029172901.534442-2-alxndr@bu.edu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Alexander Bulekov 2020-10-29 13:28:58 -04:00 committed by Paolo Bonzini
parent c59c582d56
commit a9f67c1d51
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/qtest/fuzz/generic_fuzz.c
View File

@ -229,10 +229,10 @@ void fuzz_dma_read_cb(size_t addr, size_t len, MemoryRegion *mr, bool is_write)
address_range ar = {addr, len}; address_range ar = {addr, len};
g_array_append_val(dma_regions, ar); g_array_append_val(dma_regions, ar);
pattern p = g_array_index(dma_patterns, pattern, dma_pattern_index); pattern p = g_array_index(dma_patterns, pattern, dma_pattern_index);
void *buf = pattern_alloc(p, ar.size); void *buf_base = pattern_alloc(p, ar.size);
void *buf = buf_base;
hwaddr l, addr1; hwaddr l, addr1;
MemoryRegion *mr1; MemoryRegion *mr1;
uint8_t *ram_ptr;
while (len > 0) { while (len > 0) {
l = len; l = len;
mr1 = address_space_translate(first_cpu->as, mr1 = address_space_translate(first_cpu->as,
@ -244,15 +244,6 @@ void fuzz_dma_read_cb(size_t addr, size_t len, MemoryRegion *mr, bool is_write)
l = memory_access_size(mr1, l, addr1); l = memory_access_size(mr1, l, addr1);
} else { } else {
/* ROM/RAM case */ /* ROM/RAM case */
ram_ptr = qemu_map_ram_ptr(mr1->ram_block, addr1);
memcpy(ram_ptr, buf, l);
break;
}
len -= l;
buf += l;
addr += l;
}
if (qtest_log_enabled) { if (qtest_log_enabled) {
/* /*
* With QTEST_LOG, use a normal, slow QTest memwrite. Prefix the log * With QTEST_LOG, use a normal, slow QTest memwrite. Prefix the log
@ -266,8 +257,14 @@ void fuzz_dma_read_cb(size_t addr, size_t len, MemoryRegion *mr, bool is_write)
} }
fflush(stderr); fflush(stderr);
} }
qtest_memwrite(qts_global, ar.addr, buf, ar.size); qtest_memwrite(qts_global, addr, buf, l);
g_free(buf); }
len -= l;
buf += l;
addr += l;
}
g_free(buf_base);
/* Increment the index of the pattern for the next DMA access */ /* Increment the index of the pattern for the next DMA access */
dma_pattern_index = (dma_pattern_index + 1) % dma_patterns->len; dma_pattern_index = (dma_pattern_index + 1) % dma_patterns->len;