All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: Alexander Bulekov <alxndr@bu.edu>
Subject: [PULL 11/31] fuzz: Add PCI features to the generic fuzzer
Date: Mon, 26 Oct 2020 11:06:12 +0100	[thread overview]
Message-ID: <20201026100632.212530-12-thuth@redhat.com> (raw)
In-Reply-To: <20201026100632.212530-1-thuth@redhat.com>

From: Alexander Bulekov <alxndr@bu.edu>

This patch compares TYPE_PCI_DEVICE objects against the user-provided
matching pattern. If there is a match, we use some hacks and leverage
QOS to map each possible BAR for that device. Now fuzzed inputs might be
converted to pci_read/write commands which target specific. This means
that we can fuzz a particular device's PCI configuration space,

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-Id: <20201023150746.107063-4-alxndr@bu.edu>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qtest/fuzz/generic_fuzz.c | 81 +++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
index 6e3faf4e92..483d41fb2c 100644
--- a/tests/qtest/fuzz/generic_fuzz.c
+++ b/tests/qtest/fuzz/generic_fuzz.c
@@ -24,6 +24,7 @@
 #include "exec/ramblock.h"
 #include "exec/address-spaces.h"
 #include "hw/qdev-core.h"
+#include "hw/pci/pci.h"
 
 /*
  * SEPARATOR is used to separate "operations" in the fuzz input
@@ -35,12 +36,17 @@ enum cmds {
     OP_OUT,
     OP_READ,
     OP_WRITE,
+    OP_PCI_READ,
+    OP_PCI_WRITE,
     OP_CLOCK_STEP,
 };
 
 #define DEFAULT_TIMEOUT_US 100000
 #define USEC_IN_SEC 1000000000
 
+#define PCI_HOST_BRIDGE_CFG 0xcf8
+#define PCI_HOST_BRIDGE_DATA 0xcfc
+
 typedef struct {
     ram_addr_t addr;
     ram_addr_t size; /* The number of bytes until the end of the I/O region */
@@ -55,6 +61,7 @@ static bool qtest_log_enabled;
  * user for fuzzing.
  */
 static GHashTable *fuzzable_memoryregions;
+static GPtrArray *fuzzable_pci_devices;
 
 struct get_io_cb_info {
     int index;
@@ -283,6 +290,65 @@ static void op_write(QTestState *s, const unsigned char * data, size_t len)
     }
 }
 
+static void op_pci_read(QTestState *s, const unsigned char * data, size_t len)
+{
+    enum Sizes {Byte, Word, Long, end_sizes};
+    struct {
+        uint8_t size;
+        uint8_t base;
+        uint8_t offset;
+    } a;
+    if (len < sizeof(a) || fuzzable_pci_devices->len == 0) {
+        return;
+    }
+    memcpy(&a, data, sizeof(a));
+    PCIDevice *dev = g_ptr_array_index(fuzzable_pci_devices,
+                                  a.base % fuzzable_pci_devices->len);
+    int devfn = dev->devfn;
+    qtest_outl(s, PCI_HOST_BRIDGE_CFG, (1U << 31) | (devfn << 8) | a.offset);
+    switch (a.size %= end_sizes) {
+    case Byte:
+        qtest_inb(s, PCI_HOST_BRIDGE_DATA);
+        break;
+    case Word:
+        qtest_inw(s, PCI_HOST_BRIDGE_DATA);
+        break;
+    case Long:
+        qtest_inl(s, PCI_HOST_BRIDGE_DATA);
+        break;
+    }
+}
+
+static void op_pci_write(QTestState *s, const unsigned char * data, size_t len)
+{
+    enum Sizes {Byte, Word, Long, end_sizes};
+    struct {
+        uint8_t size;
+        uint8_t base;
+        uint8_t offset;
+        uint32_t value;
+    } a;
+    if (len < sizeof(a) || fuzzable_pci_devices->len == 0) {
+        return;
+    }
+    memcpy(&a, data, sizeof(a));
+    PCIDevice *dev = g_ptr_array_index(fuzzable_pci_devices,
+                                  a.base % fuzzable_pci_devices->len);
+    int devfn = dev->devfn;
+    qtest_outl(s, PCI_HOST_BRIDGE_CFG, (1U << 31) | (devfn << 8) | a.offset);
+    switch (a.size %= end_sizes) {
+    case Byte:
+        qtest_outb(s, PCI_HOST_BRIDGE_DATA, a.value & 0xFF);
+        break;
+    case Word:
+        qtest_outw(s, PCI_HOST_BRIDGE_DATA, a.value & 0xFFFF);
+        break;
+    case Long:
+        qtest_outl(s, PCI_HOST_BRIDGE_DATA, a.value & 0xFFFFFFFF);
+        break;
+    }
+}
+
 static void op_clock_step(QTestState *s, const unsigned char *data, size_t len)
 {
     qtest_clock_step_next(s);
@@ -341,6 +407,8 @@ static void generic_fuzz(QTestState *s, const unsigned char *Data, size_t Size)
         [OP_OUT]                = op_out,
         [OP_READ]               = op_read,
         [OP_WRITE]              = op_write,
+        [OP_PCI_READ]           = op_pci_read,
+        [OP_PCI_WRITE]          = op_pci_write,
         [OP_CLOCK_STEP]         = op_clock_step,
     };
     const unsigned char *cmd = Data;
@@ -432,6 +500,18 @@ static int locate_fuzz_objects(Object *child, void *opaque)
         /* Find and save ptrs to any child MemoryRegions */
         object_child_foreach_recursive(child, locate_fuzz_memory_regions, NULL);
 
+        /*
+         * We matched an object. If its a PCI device, store a pointer to it so
+         * we can map BARs and fuzz its config space.
+         */
+        if (object_dynamic_cast(OBJECT(child), TYPE_PCI_DEVICE)) {
+            /*
+             * Don't want duplicate pointers to the same PCIDevice, so remove
+             * copies of the pointer, before adding it.
+             */
+            g_ptr_array_remove_fast(fuzzable_pci_devices, PCI_DEVICE(child));
+            g_ptr_array_add(fuzzable_pci_devices, PCI_DEVICE(child));
+        }
     } else if (object_dynamic_cast(OBJECT(child), TYPE_MEMORY_REGION)) {
         if (g_pattern_match_simple(pattern,
             object_get_canonical_path_component(child))) {
@@ -464,6 +544,7 @@ static void generic_pre_fuzz(QTestState *s)
     }
 
     fuzzable_memoryregions = g_hash_table_new(NULL, NULL);
+    fuzzable_pci_devices   = g_ptr_array_new();
 
     result = g_strsplit(getenv("QEMU_FUZZ_OBJECTS"), " ", -1);
     for (int i = 0; result[i] != NULL; i++) {
-- 
2.18.2



  parent reply	other threads:[~2020-10-26 10:15 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-26 10:06 [PULL 00/31] qtests and gitlab-CI/acceptance patches Thomas Huth
2020-10-26 10:06 ` [PULL 01/31] tests/migration: fix memleak in wait_command/wait_command_fd Thomas Huth
2020-10-26 10:06 ` [PULL 02/31] tests/qtest/libqtest: Fix detection of architecture for binaries without path Thomas Huth
2020-10-26 10:06 ` [PULL 03/31] accel: Remove _WIN32 ifdef from qtest-cpus.c Thomas Huth
2020-10-26 10:06 ` [PULL 04/31] accel: move qtest CpusAccel functions to a common location Thomas Huth
2020-10-26 10:06 ` [PULL 05/31] accel: Add xen CpusAccel using dummy-cpus Thomas Huth
2020-10-26 10:06 ` [PULL 06/31] tests/qtest: Make npcm7xx_timer-test conditional on CONFIG_NPCM7XX Thomas Huth
2020-10-26 10:06 ` [PULL 07/31] libqtest: fix the order of buffered events Thomas Huth
2020-10-26 10:06 ` [PULL 08/31] libqtest: fix memory leak in the qtest_qmp_event_ref Thomas Huth
2020-10-26 10:06 ` [PULL 09/31] memory: Add FlatView foreach function Thomas Huth
2020-10-26 10:06 ` [PULL 10/31] fuzz: Add generic virtual-device fuzzer Thomas Huth
2020-10-26 10:06 ` Thomas Huth [this message]
2020-10-26 10:06 ` [PULL 12/31] fuzz: Add DMA support to the generic-fuzzer Thomas Huth
2020-10-26 10:06 ` [PULL 13/31] fuzz: Declare DMA Read callback function Thomas Huth
2020-10-26 10:06 ` [PULL 14/31] fuzz: Add fuzzer callbacks to DMA-read functions Thomas Huth
2020-10-26 10:06 ` [PULL 15/31] fuzz: Add support for custom crossover functions Thomas Huth
2020-10-26 10:06 ` [PULL 16/31] fuzz: add a DISABLE_PCI op to generic-fuzzer Thomas Huth
2020-10-26 10:06 ` [PULL 17/31] fuzz: add a crossover function " Thomas Huth
2020-10-26 10:06 ` [PULL 18/31] scripts/oss-fuzz: Add script to reorder a generic-fuzzer trace Thomas Huth
2020-10-26 10:06 ` [PULL 19/31] scripts/oss-fuzz: Add crash trace minimization script Thomas Huth
2020-10-26 10:06 ` [PULL 20/31] fuzz: Add instructions for using generic-fuzz Thomas Huth
2020-10-26 10:06 ` [PULL 21/31] fuzz: add an "opaque" to the FuzzTarget struct Thomas Huth
2020-10-26 10:06 ` [PULL 22/31] fuzz: add generic-fuzz configs for oss-fuzz Thomas Huth
2020-10-26 10:06 ` [PULL 23/31] fuzz: register predefined generic-fuzz configs Thomas Huth
2020-10-26 10:06 ` [PULL 24/31] scripts/oss-fuzz: use hardlinks instead of copying Thomas Huth
2020-10-26 10:06 ` [PULL 25/31] scripts/oss-fuzz: ignore the generic-fuzz target Thomas Huth
2020-10-26 10:06 ` [PULL 26/31] tests/acceptance/ppc_prep_40p: Fix the URL to the NetBSD-4.0 archive Thomas Huth
2020-10-26 10:06 ` [PULL 27/31] test/acceptance: Remove the CONTINUOUS_INTEGRATION tags Thomas Huth
2020-10-26 10:06 ` [PULL 28/31] tests/acceptance: Enable AVOCADO_ALLOW_UNTRUSTED_CODE in the gitlab-CI Thomas Huth
2020-10-26 10:06 ` [PULL 29/31] test/docker/dockerfiles: Add missing packages for acceptance tests Thomas Huth
2020-10-26 10:06 ` [PULL 30/31] tests/acceptance: Remove unused import Thomas Huth
2020-10-26 10:06 ` [PULL 31/31] tests/acceptance: Use .ppm extention for Portable PixMap files Thomas Huth
2020-10-26 14:49 ` [PULL 00/31] qtests and gitlab-CI/acceptance patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201026100632.212530-12-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=alxndr@bu.edu \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.