All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Bulekov <alxndr@bu.edu>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
	Thomas Huth <thuth@redhat.com>, Alexander Bulekov <alxndr@bu.edu>,
	darren.kenny@oracle.com, bsd@redhat.com, stefanha@redhat.com,
	Paolo Bonzini <pbonzini@redhat.com>,
	philmd@redhat.com
Subject: [PATCH v3 03/16] fuzz: Add PCI features to the general fuzzer
Date: Sun, 20 Sep 2020 22:24:53 -0400	[thread overview]
Message-ID: <20200921022506.873303-4-alxndr@bu.edu> (raw)
In-Reply-To: <20200921022506.873303-1-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>
---
 tests/qtest/fuzz/general_fuzz.c | 81 +++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/tests/qtest/fuzz/general_fuzz.c b/tests/qtest/fuzz/general_fuzz.c
index bf75b215ca..7c4c1398a7 100644
--- a/tests/qtest/fuzz/general_fuzz.c
+++ b/tests/qtest/fuzz/general_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 100000000
 
+#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;
@@ -280,6 +287,65 @@ static void op_write(QTestState *s, const unsigned char * data, size_t len)
         break;
     }
 }
+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);
@@ -324,6 +390,8 @@ static void general_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;
@@ -415,6 +483,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))) {
@@ -448,6 +528,7 @@ static void general_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.28.0



  parent reply	other threads:[~2020-09-21  2:30 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-21  2:24 [PATCH v3 00/16] Add a General Virtual Device Fuzzer Alexander Bulekov
2020-09-21  2:24 ` [PATCH v3 01/16] memory: Add FlatView foreach function Alexander Bulekov
2020-10-08  6:57   ` Paolo Bonzini
2020-09-21  2:24 ` [PATCH v3 02/16] fuzz: Add general virtual-device fuzzer Alexander Bulekov
2020-09-21  5:43   ` Philippe Mathieu-Daudé
2020-09-21 14:34     ` Alexander Bulekov
2020-10-01 15:29       ` Darren Kenny
2020-10-07 13:39         ` Alexander Bulekov
2020-10-07 13:53           ` Darren Kenny
2020-10-08  7:03       ` Paolo Bonzini
2020-10-11 15:35         ` Alexander Bulekov
2020-10-12  7:02           ` Paolo Bonzini
2020-09-22 14:03   ` Alexander Bulekov
2020-10-08  7:04     ` Paolo Bonzini
2020-09-21  2:24 ` Alexander Bulekov [this message]
2020-09-21  5:44   ` [PATCH v3 03/16] fuzz: Add PCI features to the general fuzzer Philippe Mathieu-Daudé
2020-09-21 14:41     ` Alexander Bulekov
2020-09-21  2:24 ` [PATCH v3 04/16] fuzz: Add DMA support to the generic-fuzzer Alexander Bulekov
2020-10-08  7:43   ` Paolo Bonzini
2020-10-08 13:26     ` Alexander Bulekov
2020-09-21  2:24 ` [PATCH v3 05/16] fuzz: Declare DMA Read callback function Alexander Bulekov
2020-10-08  7:39   ` Paolo Bonzini
2020-10-11 15:45     ` Alexander Bulekov
2020-10-12  6:59       ` Paolo Bonzini
2020-09-21  2:24 ` [PATCH v3 06/16] fuzz: Add fuzzer callbacks to DMA-read functions Alexander Bulekov
2020-09-21  2:24 ` [PATCH v3 07/16] fuzz: Add support for custom crossover functions Alexander Bulekov
2020-09-21  2:24 ` [PATCH v3 08/16] fuzz: add a DISABLE_PCI op to general-fuzzer Alexander Bulekov
2020-09-21  2:24 ` [PATCH v3 09/16] fuzz: add a crossover function to generic-fuzzer Alexander Bulekov
2020-10-01 15:31   ` Darren Kenny
2020-10-15 13:43     ` Alexander Bulekov
2020-09-21  2:25 ` [PATCH v3 10/16] scripts/oss-fuzz: Add wrapper program for generic fuzzer Alexander Bulekov
2020-09-21  2:25 ` [PATCH v3 11/16] scripts/oss-fuzz: Add general-fuzzer build script Alexander Bulekov
2020-10-01 15:40   ` Darren Kenny
2020-10-08  7:35   ` Paolo Bonzini
2020-10-15 13:46     ` Alexander Bulekov
2020-09-21  2:25 ` [PATCH v3 12/16] scripts/oss-fuzz: Add general-fuzzer configs for oss-fuzz Alexander Bulekov
2020-09-21  2:25 ` [PATCH v3 13/16] scripts/oss-fuzz: build the general-fuzzer configs Alexander Bulekov
2020-09-21  2:25 ` [PATCH v3 14/16] scripts/oss-fuzz: Add script to reorder a general-fuzzer trace Alexander Bulekov
2020-10-08  7:42   ` Paolo Bonzini
2020-09-21  2:25 ` [PATCH v3 15/16] scripts/oss-fuzz: Add crash trace minimization script Alexander Bulekov
2020-09-21  2:25 ` [PATCH v3 16/16] fuzz: Add instructions for using general-fuzz Alexander Bulekov
2020-10-01 15:44   ` Darren Kenny
2020-09-21  2:45 ` [PATCH v3 00/16] Add a General Virtual Device Fuzzer no-reply
2020-09-21  2:58 ` no-reply
2020-09-21  3:30 ` no-reply
2020-09-21  3:43 ` no-reply
2020-09-21  3:46 ` no-reply
2020-09-21  4:30 ` no-reply
2020-09-21  4:39 ` no-reply
2020-09-21  5:22 ` no-reply
2020-09-21  5:31 ` no-reply
2020-09-21  6:17 ` no-reply
2020-09-21  6:26 ` no-reply

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=20200921022506.873303-4-alxndr@bu.edu \
    --to=alxndr@bu.edu \
    --cc=bsd@redhat.com \
    --cc=darren.kenny@oracle.com \
    --cc=lvivier@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    /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.