Commit d88ebf8b authored by Robert Sesek's avatar Robert Sesek Committed by Commit Bot

Ensure _LLVMFuzzerInitialize is always exported and marked used on Mac.

The linker's -dead_strip was removing the fuzzer initializer because it
was unreachable and not exported. This adds a new libfuzzer_exports.h
header that fuzzers can include to ensure the symbols have the proper
visibility.

Bug: 687076
Change-Id: I8fe5c523ade491a48cd7abbf85c69edb872c97db
Reviewed-on: https://chromium-review.googlesource.com/721340Reviewed-by: default avatarVarun Khaneja <vakh@chromium.org>
Reviewed-by: default avatarMax Moroz <mmoroz@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509558}
parent a022559b
......@@ -69,8 +69,6 @@ fuzzer_test("safe_browsing_dmg_fuzzer") {
":dmg_common",
"//base",
]
libfuzzer_options = [ "close_fd_mask=2" ]
}
fuzzer_test("safe_browsing_hfs_fuzzer") {
......
......@@ -13,6 +13,7 @@
#include "chrome/utility/safe_browsing/mac/hfs.h"
#include "chrome/utility/safe_browsing/mac/read_stream.h"
#include "chrome/utility/safe_browsing/mac/udif.h"
#include "testing/libfuzzer/libfuzzer_exports.h"
extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv) {
base::CommandLine::Init(*argc, *argv);
......
......@@ -10,6 +10,7 @@
#include "chrome/utility/safe_browsing/mac/hfs.h"
#include "chrome/utility/safe_browsing/mac/read_stream.h"
#include "testing/libfuzzer/libfuzzer_exports.h"
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
safe_browsing::dmg::MemoryReadStream input(data, size);
......
......@@ -136,6 +136,10 @@ template("fuzzer_test") {
if (defined(invoker.suppressed_configs)) {
configs -= invoker.suppressed_configs
}
if (is_mac) {
sources += [ "libfuzzer_exports.h" ]
}
}
} else {
# noop on unsupported platforms.
......
// Copyright 2017 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef TESTING_LIBFUZZER_LIBFUZZER_EXPORTS_H_
#define TESTING_LIBFUZZER_LIBFUZZER_EXPORTS_H_
#include "build/build_config.h"
// On macOS, the linker may strip symbols for functions that are not reachable
// by the program entrypoint. Several libFuzzer functions are resolved via
// dlsym at runtime and therefore may be dead-stripped as a result. Including
// this header in the fuzzer's implementation file will ensure that all the
// symbols are kept and exported.
#if defined(OS_MACOSX)
#define EXPORT_FUZZER_FUNCTION \
__attribute__((used)) __attribute__((visibility("default")))
#else
#define EXPORT_FUZZER_FUNCTION
#endif
extern "C" {
EXPORT_FUZZER_FUNCTION int LLVMFuzzerInitialize(int* argc, char*** argv);
EXPORT_FUZZER_FUNCTION int LLVMFuzzerTestOneInput(const uint8_t* data,
size_t size);
EXPORT_FUZZER_FUNCTION size_t LLVMFuzzerCustomMutator(uint8_t* data,
size_t size,
size_t max_size,
unsigned int seed);
EXPORT_FUZZER_FUNCTION size_t LLVMFuzzerCustomCrossOver(const uint8_t* data1,
size_t size1,
const uint8_t* data2,
size_t size2,
uint8_t* out,
size_t max_out_size,
unsigned int seed);
EXPORT_FUZZER_FUNCTION size_t LLVMFuzzerMutate(uint8_t* data,
size_t size,
size_t max_size);
} // extern "C"
#undef EXPORT_FUZZER_FUNCTION
#endif // TESTING_LIBFUZZER_LIBFUZZER_EXPORTS_H_
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment