Skip to content

Commit cc20926

Browse files
philmdjnsnow
authored andcommitted
tests/qtest/fdc-test: Add a regression test for CVE-2021-20196
Without the previous commit, when running 'make check-qtest-i386' with QEMU configured with '--enable-sanitizers' we get: AddressSanitizer:DEADLYSIGNAL ================================================================= ==287878==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000344 ==287878==The signal is caused by a WRITE memory access. ==287878==Hint: address points to the zero page. #0 0x564b2e5bac27 in blk_inc_in_flight block/block-backend.c:1346:5 #1 0x564b2e5bb228 in blk_pwritev_part block/block-backend.c:1317:5 #2 0x564b2e5bcd57 in blk_pwrite block/block-backend.c:1498:11 #3 0x564b2ca1cdd3 in fdctrl_write_data hw/block/fdc.c:2221:17 #4 0x564b2ca1b2f7 in fdctrl_write hw/block/fdc.c:829:9 #5 0x564b2dc49503 in portio_write softmmu/ioport.c:201:9 Add the reproducer for CVE-2021-20196. Suggested-by: Alexander Bulekov <alxndr@bu.edu> Reviewed-by: Darren Kenny <darren.kenny@oracle.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20211124161536.631563-4-philmd@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
1 parent 1ab95af commit cc20926

File tree

1 file changed

+38
-0
lines changed

1 file changed

+38
-0
lines changed

tests/qtest/fdc-test.c

+38
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
/* TODO actually test the results and get rid of this */
3333
#define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__))
3434

35+
#define DRIVE_FLOPPY_BLANK \
36+
"-drive if=floppy,file=null-co://,file.read-zeroes=on,format=raw,size=1440k"
37+
3538
#define TEST_IMAGE_SIZE 1440 * 1024
3639

3740
#define FLOPPY_BASE 0x3f0
@@ -546,6 +549,40 @@ static void fuzz_registers(void)
546549
}
547550
}
548551

552+
static bool qtest_check_clang_sanitizer(void)
553+
{
554+
#if defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer)
555+
return true;
556+
#else
557+
g_test_skip("QEMU not configured using --enable-sanitizers");
558+
return false;
559+
#endif
560+
}
561+
static void test_cve_2021_20196(void)
562+
{
563+
QTestState *s;
564+
565+
if (!qtest_check_clang_sanitizer()) {
566+
return;
567+
}
568+
569+
s = qtest_initf("-nographic -m 32M -nodefaults " DRIVE_FLOPPY_BLANK);
570+
571+
qtest_outw(s, 0x3f4, 0x0500);
572+
qtest_outb(s, 0x3f5, 0x00);
573+
qtest_outb(s, 0x3f5, 0x00);
574+
qtest_outw(s, 0x3f4, 0x0000);
575+
qtest_outb(s, 0x3f5, 0x00);
576+
qtest_outw(s, 0x3f1, 0x0400);
577+
qtest_outw(s, 0x3f4, 0x0000);
578+
qtest_outw(s, 0x3f4, 0x0000);
579+
qtest_outb(s, 0x3f5, 0x00);
580+
qtest_outb(s, 0x3f5, 0x01);
581+
qtest_outw(s, 0x3f1, 0x0500);
582+
qtest_outb(s, 0x3f5, 0x00);
583+
qtest_quit(s);
584+
}
585+
549586
int main(int argc, char **argv)
550587
{
551588
int fd;
@@ -576,6 +613,7 @@ int main(int argc, char **argv)
576613
qtest_add_func("/fdc/read_no_dma_18", test_read_no_dma_18);
577614
qtest_add_func("/fdc/read_no_dma_19", test_read_no_dma_19);
578615
qtest_add_func("/fdc/fuzz-registers", fuzz_registers);
616+
qtest_add_func("/fdc/fuzz/cve_2021_20196", test_cve_2021_20196);
579617

580618
ret = g_test_run();
581619

0 commit comments

Comments
 (0)