[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/31] fuzz: add a DISABLE_PCI op to generic-fuzzer
From: |
Thomas Huth |
Subject: |
[PULL 16/31] fuzz: add a DISABLE_PCI op to generic-fuzzer |
Date: |
Mon, 26 Oct 2020 11:06:17 +0100 |
From: Alexander Bulekov <alxndr@bu.edu>
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>
Message-Id: <20201023150746.107063-9-alxndr@bu.edu>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/fuzz/generic_fuzz.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
index 62a94de9dd..6ec20464bd 100644
--- a/tests/qtest/fuzz/generic_fuzz.c
+++ b/tests/qtest/fuzz/generic_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;
/*
* Allocate a block of memory and populate it with a pattern.
@@ -484,7 +486,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));
@@ -514,7 +516,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));
@@ -569,6 +571,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) {
@@ -624,6 +631,7 @@ static void generic_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,
@@ -656,6 +664,7 @@ static void generic_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.18.2
- [PULL 06/31] tests/qtest: Make npcm7xx_timer-test conditional on CONFIG_NPCM7XX, (continued)
- [PULL 06/31] tests/qtest: Make npcm7xx_timer-test conditional on CONFIG_NPCM7XX, Thomas Huth, 2020/10/26
- [PULL 07/31] libqtest: fix the order of buffered events, Thomas Huth, 2020/10/26
- [PULL 08/31] libqtest: fix memory leak in the qtest_qmp_event_ref, Thomas Huth, 2020/10/26
- [PULL 09/31] memory: Add FlatView foreach function, Thomas Huth, 2020/10/26
- [PULL 10/31] fuzz: Add generic virtual-device fuzzer, Thomas Huth, 2020/10/26
- [PULL 11/31] fuzz: Add PCI features to the generic fuzzer, Thomas Huth, 2020/10/26
- [PULL 12/31] fuzz: Add DMA support to the generic-fuzzer, Thomas Huth, 2020/10/26
- [PULL 15/31] fuzz: Add support for custom crossover functions, Thomas Huth, 2020/10/26
- [PULL 14/31] fuzz: Add fuzzer callbacks to DMA-read functions, Thomas Huth, 2020/10/26
- [PULL 19/31] scripts/oss-fuzz: Add crash trace minimization script, Thomas Huth, 2020/10/26
- [PULL 16/31] fuzz: add a DISABLE_PCI op to generic-fuzzer,
Thomas Huth <=
- [PULL 20/31] fuzz: Add instructions for using generic-fuzz, Thomas Huth, 2020/10/26
- [PULL 21/31] fuzz: add an "opaque" to the FuzzTarget struct, Thomas Huth, 2020/10/26
- [PULL 17/31] fuzz: add a crossover function to generic-fuzzer, Thomas Huth, 2020/10/26
- [PULL 18/31] scripts/oss-fuzz: Add script to reorder a generic-fuzzer trace, Thomas Huth, 2020/10/26
- [PULL 22/31] fuzz: add generic-fuzz configs for oss-fuzz, Thomas Huth, 2020/10/26
- [PULL 24/31] scripts/oss-fuzz: use hardlinks instead of copying, Thomas Huth, 2020/10/26
- [PULL 13/31] fuzz: Declare DMA Read callback function, Thomas Huth, 2020/10/26
- [PULL 23/31] fuzz: register predefined generic-fuzz configs, Thomas Huth, 2020/10/26
- [PULL 25/31] scripts/oss-fuzz: ignore the generic-fuzz target, Thomas Huth, 2020/10/26
- [PULL 27/31] test/acceptance: Remove the CONTINUOUS_INTEGRATION tags, Thomas Huth, 2020/10/26