mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fuzz: add datadir for oss-fuzz compatability

Browse Source 
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>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-id: 20200512030133.29896-2-alxndr@bu.edu
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Alexander Bulekov 2020-05-11 23:01:30 -04:00 committed by Stefan Hajnoczi
parent 769335ecb1
commit 7a071a96d3
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sysemu/sysemu.h
View File

@ -15,6 +15,8 @@ extern const char *qemu_name;
extern QemuUUID qemu_uuid; extern QemuUUID qemu_uuid;
extern bool qemu_uuid_set; extern bool qemu_uuid_set;
void qemu_add_data_dir(const char *path);
void qemu_add_exit_notifier(Notifier *notify); void qemu_add_exit_notifier(Notifier *notify);
void qemu_remove_exit_notifier(Notifier *notify); void qemu_remove_exit_notifier(Notifier *notify);

2
softmmu/vl.c
View File

@ -1993,7 +1993,7 @@ char *qemu_find_file(int type, const char *name)
return NULL; return NULL;
} }
static void qemu_add_data_dir(const char *path) void qemu_add_data_dir(const char *path)
{ {
int i; int i;

15
tests/qtest/fuzz/fuzz.c
View File

@ -137,6 +137,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
{ {
char *target_name; char *target_name;
char *dir;
/* Initialize qgraph and modules */ /* Initialize qgraph and modules */
qos_graph_init(); qos_graph_init();
@ -147,6 +148,20 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
target_name = strstr(**argv, "-target-"); target_name = strstr(**argv, "-target-");
if (target_name) { /* The binary name specifies the target */ if (target_name) { /* The binary name specifies the target */
target_name += strlen("-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.
*/
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 */ } else if (*argc > 1) { /* The target is specified as an argument */
target_name = (*argv)[1]; target_name = (*argv)[1];
if (!strstr(target_name, "--fuzz-target=")) { if (!strstr(target_name, "--fuzz-target=")) {