Skip to contentSkip to conversation

Small fuzzer-related changes

PATCH In review Alexander Bulekov 3 participants 9 messages Jan 17, 2021 – Jan 18, 2021

lore
Share & tools
lore
#0 lore raw

cover Small fuzzer-related changes

Fix outdated paths in documentation and log some useful information.

Alexander Bulekov (2):
docs/fuzz: fix pre-meson path
fuzz: log the arguments used to initialize QEMU

 docs/devel/fuzzing.rst  |  5 ++---
 tests/qtest/fuzz/fuzz.c | 11 ++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/2 docs/fuzz: fix pre-meson path

---
 docs/devel/fuzzing.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
docs/devel/fuzzing.rst +2 -3
index 8792358854..b9bb07988b 100644
@@ -119,7 +119,7 @@ Adding a new fuzzer
 
 Coverage over virtual devices can be improved by adding additional fuzzers.
 Fuzzers are kept in ``tests/qtest/fuzz/`` and should be added to
-``tests/qtest/fuzz/Makefile.include``
+``tests/qtest/fuzz/meson.build``
 
 Fuzzers can rely on both qtest and libqos to communicate with virtual devices.
 
@@ -128,8 +128,7 @@ Fuzzers can rely on both qtest and libqos to communicate with virtual devices.
 2. Write the fuzzing code using the libqtest/libqos API. See existing fuzzers
    for reference.
 
-3. Register the fuzzer in ``tests/fuzz/Makefile.include`` by appending the
-   corresponding object to fuzz-obj-y
+3. Add the fuzzer to ``tests/qtest/fuzz/meson.build``.
 
 Fuzzers can be more-or-less thought of as special qtest programs which can
 modify the qtest commands and/or qtest command arguments based on inputs
Signature · 1 line
2.28.0
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] docs/fuzz: fix pre-meson path

Quoted 20 lines · Alexander Bulekov
---
  docs/devel/fuzzing.rst | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
docs/devel/fuzzing.rst +1 -1
index 8792358854..b9bb07988b 100644
@@ -119,7 +119,7 @@ Adding a new fuzzer
 
  Coverage over virtual devices can be improved by adding additional fuzzers.
  Fuzzers are kept in ``tests/qtest/fuzz/`` and should be added to
-``tests/qtest/fuzz/Makefile.include``
+``tests/qtest/fuzz/meson.build``
 
  Fuzzers can rely on both qtest and libqos to communicate with virtual devices.
 

docs/devel/fuzzing.rst Fuzzers can rely on both qtest and libqos to communicate with virtual devices. · line 134

Quoted 9 lines
docs/devel/fuzzing.rst +1 -2
@@ -128,8 +128,7 @@ Fuzzers can rely on both qtest and libqos to communicate with virtual devices.
  2. Write the fuzzing code using the libqtest/libqos API. See existing fuzzers
     for reference.
 
-3. Register the fuzzer in ``tests/fuzz/Makefile.include`` by appending the
-   corresponding object to fuzz-obj-y
+3. Add the fuzzer to ``tests/qtest/fuzz/meson.build``.
 
  Fuzzers can be more-or-less thought of as special qtest programs which can
  modify the qtest commands and/or qtest command arguments based on inputs
#3 lore raw

PATCH 2/2 fuzz: log the arguments used to initialize QEMU

In reply to Alexander Bulekov

This is useful for building reproducers. Instead checking the code or the QEMU_FUZZ_ARGS, the arguments are at the top of the crash log.

---
 tests/qtest/fuzz/fuzz.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
tests/qtest/fuzz/fuzz.c +10 -1
index 238866a037..496d11a231 100644
@@ -159,6 +159,8 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
     char *target_name;
     const char *bindir;
     char *datadir;
+    GString *cmd_line;
+    gchar *pretty_cmd_line;
     bool serialize = false;
 
     /* Initialize qgraph and modules */
@@ -217,7 +219,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
     }
 
     /* Run QEMU's softmmu main with the fuzz-target dependent arguments */
-    GString *cmd_line = fuzz_target->get_init_cmdline(fuzz_target);
+    cmd_line = fuzz_target->get_init_cmdline(fuzz_target);
     g_string_append_printf(cmd_line, " %s -qtest /dev/null ",
                            getenv("QTEST_LOG") ? "" : "-qtest-log none");
 
@@ -226,6 +228,13 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
     wordexp(cmd_line->str, &result, 0);
     g_string_free(cmd_line, true);
 
+    if (getenv("QTEST_LOG")) {
+        pretty_cmd_line  = g_strjoinv(" ", result.we_wordv + 1);
+        printf("Starting %s with Arguments: %s\n",
+                result.we_wordv[0], pretty_cmd_line);
+        g_free(pretty_cmd_line);
+    }
+
     qemu_init(result.we_wordc, result.we_wordv, NULL);
 
     /* re-enable the rcu atfork, which was previously disabled in qemu_init */
Signature · 1 line
2.28.0
Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] fuzz: log the arguments used to initialize QEMU

Quoted 35 lines · Alexander Bulekov

This is useful for building reproducers. Instead checking the code or the QEMU_FUZZ_ARGS, the arguments are at the top of the crash log.

---
  tests/qtest/fuzz/fuzz.c | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
tests/qtest/fuzz/fuzz.c +3 -1
index 238866a037..496d11a231 100644
@@ -159,6 +159,8 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
      char *target_name;
      const char *bindir;
      char *datadir;
+    GString *cmd_line;
+    gchar *pretty_cmd_line;
      bool serialize = false;
 
      /* Initialize qgraph and modules */
@@ -217,7 +219,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
      }
 
      /* Run QEMU's softmmu main with the fuzz-target dependent arguments */
-    GString *cmd_line = fuzz_target->get_init_cmdline(fuzz_target);
+    cmd_line = fuzz_target->get_init_cmdline(fuzz_target);
      g_string_append_printf(cmd_line, " %s -qtest /dev/null ",
                             getenv("QTEST_LOG") ? "" : "-qtest-log none");
 
@@ -226,6 +228,13 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
      wordexp(cmd_line->str, &result, 0);
      g_string_free(cmd_line, true);
 

tests/qtest/fuzz/fuzz.c int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp) · line 240

Quoted 10 lines
tests/qtest/fuzz/fuzz.c +7 -0
+    if (getenv("QTEST_LOG")) {
+        pretty_cmd_line  = g_strjoinv(" ", result.we_wordv + 1);
+        printf("Starting %s with Arguments: %s\n",
+                result.we_wordv[0], pretty_cmd_line);
+        g_free(pretty_cmd_line);
+    }
+
      qemu_init(result.we_wordc, result.we_wordv, NULL);
 
      /* re-enable the rcu atfork, which was previously disabled in qemu_init */
#5 lore raw

pending fuzzing patches (was Re: [PATCH 2/2] fuzz: log the arguments used to initialize QEMU)

In reply to Alexander Bulekov
Quoted 35 lines · Alexander Bulekov

This is useful for building reproducers. Instead checking the code or the QEMU_FUZZ_ARGS, the arguments are at the top of the crash log.

---
  tests/qtest/fuzz/fuzz.c | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
tests/qtest/fuzz/fuzz.c +3 -1
index 238866a037..496d11a231 100644
@@ -159,6 +159,8 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
      char *target_name;
      const char *bindir;
      char *datadir;
+    GString *cmd_line;
+    gchar *pretty_cmd_line;
      bool serialize = false;
 
      /* Initialize qgraph and modules */
@@ -217,7 +219,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
      }
 
      /* Run QEMU's softmmu main with the fuzz-target dependent arguments */
-    GString *cmd_line = fuzz_target->get_init_cmdline(fuzz_target);
+    cmd_line = fuzz_target->get_init_cmdline(fuzz_target);
      g_string_append_printf(cmd_line, " %s -qtest /dev/null ",
                             getenv("QTEST_LOG") ? "" : "-qtest-log none");
 
@@ -226,6 +228,13 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
      wordexp(cmd_line->str, &result, 0);
      g_string_free(cmd_line, true);
 

tests/qtest/fuzz/fuzz.c int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp) · line 240

Quoted 10 lines
tests/qtest/fuzz/fuzz.c +7 -0
+    if (getenv("QTEST_LOG")) {
+        pretty_cmd_line  = g_strjoinv(" ", result.we_wordv + 1);
+        printf("Starting %s with Arguments: %s\n",
+                result.we_wordv[0], pretty_cmd_line);
+        g_free(pretty_cmd_line);
+    }
+
      qemu_init(result.we_wordc, result.we_wordv, NULL);
 
      /* re-enable the rcu atfork, which was previously disabled in qemu_init */

Hi Alexander, can you send _me_ a pull request for all the pending fuzzing patches? I haven't paid much attention, but I have seen external contributions and I have the feeling that they aren't being applied/reviewed promptly.

Paolo

#6 lore raw

Re: pending fuzzing patches (was Re: [PATCH 2/2] fuzz: log the arguments used to initialize QEMU)

Quoted 38 lines · Paolo Bonzini
Quoted 37 lines · Alexander Bulekov

This is useful for building reproducers. Instead checking the code or the QEMU_FUZZ_ARGS, the arguments are at the top of the crash log.

---
  tests/qtest/fuzz/fuzz.c | 11 ++++++++++-

  1 file changed, 10 insertions(+), 1 deletion(-)
tests/qtest/fuzz/fuzz.c +7 -1
index 238866a037..496d11a231 100644
@@ -159,6 +159,8 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char 
 ***envp)
       char *target_name;
       const char *bindir;
       char *datadir;
+    GString *cmd_line;
+    gchar *pretty_cmd_line;
       bool serialize = false;
       /* Initialize qgraph and modules */
@@ -217,7 +219,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char 
 ***envp)
       }
       /* Run QEMU's softmmu main with the fuzz-target dependent arguments */
-    GString *cmd_line = fuzz_target->get_init_cmdline(fuzz_target);
+    cmd_line = fuzz_target->get_init_cmdline(fuzz_target);
       g_string_append_printf(cmd_line, " %s -qtest /dev/null ",
                              getenv("QTEST_LOG") ? "" : "-qtest-log none");
@@ -226,6 +228,13 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, 
 char ***envp)
       wordexp(cmd_line->str, &result, 0);
       g_string_free(cmd_line, true);
+    if (getenv("QTEST_LOG")) {
+        pretty_cmd_line  = g_strjoinv(" ", result.we_wordv + 1);
+        printf("Starting %s with Arguments: %s\n",
+                result.we_wordv[0], pretty_cmd_line);
Quoted 8 lines

tests/qtest/fuzz/fuzz.c int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)

Quoted 6 lines
tests/qtest/fuzz/fuzz.c +3 -0
+        g_free(pretty_cmd_line);
+    }
+
       qemu_init(result.we_wordc, result.we_wordv, NULL);
       /* re-enable the rcu atfork, which was previously disabled in qemu_init */
 

Hi Alexander, can you send _me_ a pull request for all the pending fuzzing patches?  I haven't paid much attention, but I have seen external contributions and I have the feeling that they aren't being applied/reviewed promptly.

I'm normally taking the fuzzing patches through the qtest tree (and also merged some contributions last week, see 22ec0c696fd28e and the following commits) ... which patch series that got missed did you have in mind?

Anyway, the amount of fuzzer patches seems to have increased during the last weeks, and I'm not very familiar with the fuzzing stuff and also sometimes I do not get CC:-ed on fuzzing patches, so it might make sense indeed that Alexander now gathers the fuzzing patches and starts sending pull requests for these. Alexander, do you want to have a try now?

Thomas

#7 lore raw

Re: pending fuzzing patches (was Re: [PATCH 2/2] fuzz: log the arguments used to initialize QEMU)

Quoted 4 lines · Thomas Huth
Quoted 2 lines

Hi Alexander, can you send _me_ a pull request for all the pending fuzzing patches?  I haven't paid much attention, but I have seen external contributions and I have the feeling that they aren't being applied/reviewed promptly.

I'm normally taking the fuzzing patches through the qtest tree (and also merged some contributions last week, see 22ec0c696fd28e and the following commits) ... which patch series that got missed did you have in mind?

I was thinking mostly of "fuzz: improve crash case minimization" which I had lost track of, but that one has been merged.

Paolo

Quoted 3 lines

Anyway, the amount of fuzzer patches seems to have increased during the last weeks, and I'm not very familiar with the fuzzing stuff and also sometimes I do not get CC:-ed on fuzzing patches, so it might make sense indeed that Alexander now gathers the fuzzing patches and starts sending pull requests for these. Alexander, do you want to have a try now?

 Thomas

#8 lore raw

Re: pending fuzzing patches (was Re: [PATCH 2/2] fuzz: log the arguments used to initialize QEMU)

In reply to Thomas Huth
Quoted 56 lines · Thomas Huth
Quoted 42 lines · Paolo Bonzini
Quoted 41 lines · Alexander Bulekov

This is useful for building reproducers. Instead checking the code or the QEMU_FUZZ_ARGS, the arguments are at the top of the crash log.

---
  tests/qtest/fuzz/fuzz.c | 11 ++++++++++-

  1 file changed, 10 insertions(+), 1 deletion(-)
tests/qtest/fuzz/fuzz.c +10 -1
index 238866a037..496d11a231 100644
@@ -159,6 +159,8 @@ int LLVMFuzzerInitialize(int *argc, char
 ***argv, char ***envp)
       char *target_name;
       const char *bindir;
       char *datadir;
+    GString *cmd_line;
+    gchar *pretty_cmd_line;
       bool serialize = false;
       /* Initialize qgraph and modules */
@@ -217,7 +219,7 @@ int LLVMFuzzerInitialize(int *argc, char
 ***argv, char ***envp)
       }
       /* Run QEMU's softmmu main with the fuzz-target dependent arguments */
-    GString *cmd_line = fuzz_target->get_init_cmdline(fuzz_target);
+    cmd_line = fuzz_target->get_init_cmdline(fuzz_target);
       g_string_append_printf(cmd_line, " %s -qtest /dev/null ",
                              getenv("QTEST_LOG") ? "" : "-qtest-log none");
@@ -226,6 +228,13 @@ int LLVMFuzzerInitialize(int *argc, char
 ***argv, char ***envp)
       wordexp(cmd_line->str, &result, 0);
       g_string_free(cmd_line, true);
+    if (getenv("QTEST_LOG")) {
+        pretty_cmd_line  = g_strjoinv(" ", result.we_wordv + 1);
+        printf("Starting %s with Arguments: %s\n",
+                result.we_wordv[0], pretty_cmd_line);
+        g_free(pretty_cmd_line);
+    }
+
       qemu_init(result.we_wordc, result.we_wordv, NULL);
Quoted 8 lines
Quoted 3 lines
tests/qtest/fuzz/fuzz.c +0 -0
       /* re-enable the rcu atfork, which was previously disabled in

qemu_init */

Hi Alexander, can you send _me_ a pull request for all the pending fuzzing patches?  I haven't paid much attention, but I have seen external contributions and I have the feeling that they aren't being applied/reviewed promptly.

I'm normally taking the fuzzing patches through the qtest tree (and also merged some contributions last week, see 22ec0c696fd28e and the following commits) ... which patch series that got missed did you have in mind?

Quoted 6 lines

Anyway, the amount of fuzzer patches seems to have increased during the last weeks, and I'm not very familiar with the fuzzing stuff and also sometimes I do not get CC:-ed on fuzzing patches, so it might make sense indeed that Alexander now gathers the fuzzing patches and starts sending pull requests for these. Alexander, do you want to have a try now?

Sure - I'll wait for both remaining series to be fully reviewed. Then I'll follow this: https://wiki.qemu.org/Contribute/SubmitAPullRequest
-Alex

Quoted 2 lines

Thomas