From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Alexander Bulekov <alxndr@bu.edu>, qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Thomas Huth <thuth@redhat.com>,
darren.kenny@oracle.com, bsd@redhat.com, stefanha@redhat.com,
Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH 1/4] fuzz: add datadir for oss-fuzz compatability
Date: Wed, 20 May 2020 18:51:13 +0200 [thread overview]
Message-ID: <18b02a81-1f0e-973a-1867-4ff30edbe128@redhat.com> (raw)
In-Reply-To: <20200512030133.29896-2-alxndr@bu.edu>
On 5/12/20 5:01 AM, Alexander Bulekov wrote:
> This allows us to keep pc-bios in executable_dir/pc-bios, rather than
> executable_dir/../pc-bios, which is incompatible with oss-fuzz' file
> structure.
>
> Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
> ---
> include/sysemu/sysemu.h | 2 ++
> softmmu/vl.c | 2 +-
> tests/qtest/fuzz/fuzz.c | 15 +++++++++++++++
> 3 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
> index ef81302e1a..cc96b66fc9 100644
> --- a/include/sysemu/sysemu.h
> +++ b/include/sysemu/sysemu.h
> @@ -15,6 +15,8 @@ extern const char *qemu_name;
> extern QemuUUID qemu_uuid;
> extern bool qemu_uuid_set;
>
> +void qemu_add_data_dir(const char *path);
> +
> void qemu_add_exit_notifier(Notifier *notify);
> void qemu_remove_exit_notifier(Notifier *notify);
>
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index afd2615fb3..c71485a965 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -1993,7 +1993,7 @@ char *qemu_find_file(int type, const char *name)
> return NULL;
> }
>
> -static void qemu_add_data_dir(const char *path)
> +void qemu_add_data_dir(const char *path)
> {
> int i;
>
> diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c
> index f5c923852e..33365c3782 100644
> --- a/tests/qtest/fuzz/fuzz.c
> +++ b/tests/qtest/fuzz/fuzz.c
> @@ -137,6 +137,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
> {
>
> char *target_name;
> + char *dir;
>
> /* Initialize qgraph and modules */
> qos_graph_init();
> @@ -147,6 +148,20 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
> target_name = strstr(**argv, "-target-");
> if (target_name) { /* The binary name specifies the target */
> target_name += strlen("-target-");
> + /*
> + * With oss-fuzz, the executable is kept in the root of a directory (we
> + * cannot assume the path). All data (including bios binaries) must be
> + * in the same dir, or a subdir. Thus, we cannot place the pc-bios so
> + * that it would be in exec_dir/../pc-bios.
> + * As a workaround, oss-fuzz allows us to use argv[0] to get the
> + * location of the executable. Using this we add exec_dir/pc-bios to
> + * the datadirs.
I don't understand well the problem. How do you run it?
> + */
> + dir = g_build_filename(g_path_get_dirname(**argv), "pc-bios", NULL);
> + if (g_file_test(dir, G_FILE_TEST_IS_DIR)) {
> + qemu_add_data_dir(dir);
> + }
> + g_free(dir);
> } else if (*argc > 1) { /* The target is specified as an argument */
> target_name = (*argv)[1];
> if (!strstr(target_name, "--fuzz-target=")) {
>
next prev parent reply other threads:[~2020-05-20 16:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-12 3:01 [PATCH 0/4] fuzz: misc changes for oss-fuzz compatability Alexander Bulekov
2020-05-12 3:01 ` [PATCH 1/4] fuzz: add datadir " Alexander Bulekov
2020-05-12 7:59 ` Darren Kenny
2020-05-20 16:51 ` Philippe Mathieu-Daudé [this message]
2020-05-20 18:07 ` Alexander Bulekov
2020-05-12 3:01 ` [PATCH 2/4] fuzz: fix typo in i440fx-qtest-reboot arguments Alexander Bulekov
2020-05-12 7:59 ` Darren Kenny
2020-05-12 8:14 ` Philippe Mathieu-Daudé
2020-05-12 3:01 ` [PATCH 3/4] fuzz: add mangled object name to linker script Alexander Bulekov
2020-05-12 8:01 ` Darren Kenny
2020-05-12 3:01 ` [PATCH 4/4] fuzz: run the main-loop in fork-server process Alexander Bulekov
2020-05-12 8:00 ` Darren Kenny
2020-05-19 15:47 ` [PATCH 0/4] fuzz: misc changes for oss-fuzz compatability Alexander Bulekov
2020-05-26 15:34 ` Stefan Hajnoczi
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=18b02a81-1f0e-973a-1867-4ff30edbe128@redhat.com \
--to=philmd@redhat.com \
--cc=alxndr@bu.edu \
--cc=bsd@redhat.com \
--cc=darren.kenny@oracle.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).