Skip to content

[SR-14813] [Fuzzers] Fix the mangler and reflection fuzzer build. #38023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 29, 2021
Merged

[SR-14813] [Fuzzers] Fix the mangler and reflection fuzzer build. #38023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6ec498
[SR-14813] [Fuzzers] Fix the mangler and reflection fuzzer build.
al45tair Jun 22, 2021
d74fef9
[SR-14813] Add Swift compile options for fuzzing.
al45tair Jun 23, 2021
b7db160
[SR-14813] Use the C++ standard library includes.
al45tair Jun 23, 2021
501f30d
[SR-14813] Tidy up the DLQ_GetPtrAuthMask case.
al45tair Jun 23, 2021
28c0d9d
[SR-14813] Reformat code slightly.
al45tair Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,9 @@ function(add_swift_fuzzer_host_tool executable)

# Then make sure that we pass the -fsanitize=fuzzer flag both on the cflags
# and cxx flags line.
target_compile_options(${executable} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:"-fsanitize=fuzzer">)
target_compile_options(${executable} PRIVATE
$<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-fsanitize=fuzzer>
$<$<COMPILE_LANGUAGE:Swift>:-sanitize=fuzzer>)
target_link_libraries(${executable} PRIVATE "-fsanitize=fuzzer")
endfunction()

Expand Down
17 changes: 14 additions & 3 deletions tools/swift-reflection-fuzzer/swift-reflection-fuzzer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@
#include "llvm/Object/ELFObjectFile.h"
#include "llvm/Object/MachOUniversal.h"
#include "llvm/Support/CommandLine.h"
#include <stddef.h>
#include <stdint.h>
#include <cstddef>
#include <cstdint>
#include <cstdio>

#if defined(__APPLE__) && defined(__MACH__)
#include <TargetConditionals.h>
Expand Down Expand Up @@ -73,6 +74,16 @@ class ObjectMemoryReader : public MemoryReader {
*result = sizeof(void *);
return true;
}
case DLQ_GetPtrAuthMask: {
auto result = static_cast<uintptr_t *>(outBuffer);
#if __has_feature(ptrauth_calls)
*result = static_cast<uintptr_t>(
ptrauth_strip(static_cast<void *>(0x0007ffffffffffff), 0));
#else
*result = ~uintptr_t(0);
#endif
return true;
}
case DLQ_GetSizeSize: {
auto result = static_cast<uint8_t *>(outBuffer);
*result = sizeof(size_t);
Expand Down Expand Up @@ -131,6 +142,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
auto reader = std::make_shared<ObjectMemoryReader>();
NativeReflectionContext context(std::move(reader));
context.addImage(RemoteAddress(Data));
context.getBuilder().dumpAllSections(std::cout);
context.getBuilder().dumpAllSections(stdout);
return 0; // Non-zero return values are reserved for future use.
}