[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 08/16] fuzz: add a DISABLE_PCI op to general-fuzzer
From: |
Alexander Bulekov |
Subject: |
[PATCH v4 08/16] fuzz: add a DISABLE_PCI op to general-fuzzer |
Date: |
Thu, 15 Oct 2020 09:41:28 -0400 |
This new operation is used in the next commit, which concatenates two
fuzzer-generated inputs. With this operation, we can prevent the second
input from clobbering the PCI configuration performed by the first.
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
---
tests/qtest/fuzz/general_fuzz.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/fuzz/general_fuzz.c b/tests/qtest/fuzz/general_fuzz.c
index 0fd42a16da..11346e229a 100644
--- a/tests/qtest/fuzz/general_fuzz.c
+++ b/tests/qtest/fuzz/general_fuzz.c
@@ -39,6 +39,7 @@ enum cmds {
OP_WRITE,
OP_PCI_READ,
OP_PCI_WRITE,
+ OP_DISABLE_PCI,
OP_ADD_DMA_PATTERN,
OP_CLEAR_DMA_PATTERNS,
OP_CLOCK_STEP,
@@ -116,6 +117,7 @@ static GArray *dma_regions;
static GArray *dma_patterns;
static int dma_pattern_index;
+static bool pci_disabled;
void fuzz_dma_read_cb(size_t addr, size_t len, MemoryRegion *mr, bool
is_write);
@@ -481,7 +483,7 @@ static void op_pci_read(QTestState *s, const unsigned char
* data, size_t len)
uint8_t base;
uint8_t offset;
} a;
- if (len < sizeof(a) || fuzzable_pci_devices->len == 0) {
+ if (len < sizeof(a) || fuzzable_pci_devices->len == 0 || pci_disabled) {
return;
}
memcpy(&a, data, sizeof(a));
@@ -511,7 +513,7 @@ static void op_pci_write(QTestState *s, const unsigned char
* data, size_t len)
uint8_t offset;
uint32_t value;
} a;
- if (len < sizeof(a) || fuzzable_pci_devices->len == 0) {
+ if (len < sizeof(a) || fuzzable_pci_devices->len == 0 || pci_disabled) {
return;
}
memcpy(&a, data, sizeof(a));
@@ -566,6 +568,11 @@ static void op_clock_step(QTestState *s, const unsigned
char *data, size_t len)
qtest_clock_step_next(s);
}
+static void op_disable_pci(QTestState *s, const unsigned char *data, size_t
len)
+{
+ pci_disabled = true;
+}
+
static void handle_timeout(int sig)
{
if (qtest_log_enabled) {
@@ -620,6 +627,7 @@ static void general_fuzz(QTestState *s, const unsigned char
*Data, size_t Size)
[OP_WRITE] = op_write,
[OP_PCI_READ] = op_pci_read,
[OP_PCI_WRITE] = op_pci_write,
+ [OP_DISABLE_PCI] = op_disable_pci,
[OP_ADD_DMA_PATTERN] = op_add_dma_pattern,
[OP_CLEAR_DMA_PATTERNS] = op_clear_dma_patterns,
[OP_CLOCK_STEP] = op_clock_step,
@@ -652,6 +660,7 @@ static void general_fuzz(QTestState *s, const unsigned char
*Data, size_t Size)
}
op_clear_dma_patterns(s, NULL, 0);
+ pci_disabled = false;
while (cmd && Size) {
/* Get the length until the next command or end of input */
--
2.28.0
- [PATCH v4 05/16] fuzz: Declare DMA Read callback function, (continued)
- [PATCH v4 05/16] fuzz: Declare DMA Read callback function, Alexander Bulekov, 2020/10/15
- [PATCH v4 04/16] fuzz: Add DMA support to the generic-fuzzer, Alexander Bulekov, 2020/10/15
- [PATCH v4 06/16] fuzz: Add fuzzer callbacks to DMA-read functions, Alexander Bulekov, 2020/10/15
- [PATCH v4 07/16] fuzz: Add support for custom crossover functions, Alexander Bulekov, 2020/10/15
- [PATCH v4 14/16] fuzz: add general-fuzz configs for oss-fuzz, Alexander Bulekov, 2020/10/15
- [PATCH v4 15/16] fuzz: register predefined general-fuzz configs, Alexander Bulekov, 2020/10/15
- [PATCH v4 16/16] scripts/oss-fuzz: remove the general-fuzz target, Alexander Bulekov, 2020/10/15
- [PATCH v4 09/16] fuzz: add a crossover function to generic-fuzzer, Alexander Bulekov, 2020/10/15
- [PATCH v4 08/16] fuzz: add a DISABLE_PCI op to general-fuzzer,
Alexander Bulekov <=
- [PATCH v4 12/16] fuzz: Add instructions for using general-fuzz, Alexander Bulekov, 2020/10/15
- [PATCH v4 11/16] scripts/oss-fuzz: Add crash trace minimization script, Alexander Bulekov, 2020/10/15
- [PATCH v4 10/16] scripts/oss-fuzz: Add script to reorder a general-fuzzer trace, Alexander Bulekov, 2020/10/15
- [PATCH v4 13/16] fuzz: add an "opaque" to the FuzzTarget struct, Alexander Bulekov, 2020/10/15
- Re: [PATCH v4 00/16] Add a General Virtual Device Fuzzer, no-reply, 2020/10/15
- Re: [PATCH v4 00/16] Add a General Virtual Device Fuzzer, Paolo Bonzini, 2020/10/16