Navigation Menu

Skip to content

Commit

Permalink
all: basic building on netbsd
Browse files Browse the repository at this point in the history
This just makes make TARGETOS=netbsd succeed.
We don't yet have prog target for netbsd.
  • Loading branch information
dvyukov committed Oct 23, 2017
1 parent 632b86c commit e729550
Show file tree
Hide file tree
Showing 8 changed files with 222 additions and 175 deletions.
174 changes: 174 additions & 0 deletions executor/executor_bsd.cc
@@ -0,0 +1,174 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.

// +build

#define SYZ_EXECUTOR
#include "common_freebsd.h"

#include "executor_posix.h"

#include "executor.h"

#include "syscalls_freebsd.h"

#include <signal.h>
#include <sys/mman.h>
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>

const int kInFd = 3;
const int kOutFd = 4;

uint32_t* output_data;
uint32_t* output_pos;

int main(int argc, char** argv)
{
if (argc == 2 && strcmp(argv[1], "version") == 0) {
puts(GOOS " " GOARCH " " SYZ_REVISION " " GIT_REVISION);
return 0;
}

if (mmap(&input_data[0], kMaxInput, PROT_READ, MAP_PRIVATE | MAP_FIXED, kInFd, 0) != &input_data[0])
fail("mmap of input file failed");
// The output region is the only thing in executor process for which consistency matters.
// If it is corrupted ipc package will fail to parse its contents and panic.
// But fuzzer constantly invents new ways of how to currupt the region,
// so we map the region at a (hopefully) hard to guess address surrounded by unmapped pages.
void* const kOutputDataAddr = (void*)0x1ddbc20000;
output_data = (uint32_t*)mmap(kOutputDataAddr, kMaxOutput, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, kOutFd, 0);
if (output_data != kOutputDataAddr)
fail("mmap of output file failed");
// Prevent random programs to mess with these fds.
// Due to races in collider mode, a program can e.g. ftruncate one of these fds,
// which will cause fuzzer to crash.
// That's also the reason why we close kInPipeFd/kOutPipeFd below.
close(kInFd);
close(kOutFd);

// Some minimal sandboxing.
struct rlimit rlim;
rlim.rlim_cur = rlim.rlim_max = 128 << 20;
setrlimit(RLIMIT_AS, &rlim);
rlim.rlim_cur = rlim.rlim_max = 8 << 20;
setrlimit(RLIMIT_MEMLOCK, &rlim);
rlim.rlim_cur = rlim.rlim_max = 1 << 20;
setrlimit(RLIMIT_FSIZE, &rlim);
rlim.rlim_cur = rlim.rlim_max = 1 << 20;
setrlimit(RLIMIT_STACK, &rlim);
rlim.rlim_cur = rlim.rlim_max = 0;
setrlimit(RLIMIT_CORE, &rlim);

install_segv_handler();
setup_control_pipes();
receive_handshake();
reply_handshake();
cover_open();

for (;;) {
receive_execute(false);
char cwdbuf[128] = "/syz-tmpXXXXXX";
if (mkdtemp(cwdbuf))
fail("mkdtemp failed");
int pid = fork();
if (pid < 0)
fail("fork failed");
if (pid == 0) {
close(kInPipeFd);
close(kOutPipeFd);
if (chdir(cwdbuf))
fail("chdir failed");
output_pos = output_data;
execute_one();
doexit(0);
}
int status = 0;
uint64_t start = current_time_ms();
uint64_t last_executed = start;
uint32_t executed_calls = __atomic_load_n(output_data, __ATOMIC_RELAXED);
for (;;) {
int res = waitpid(pid, &status, WNOHANG);
if (res == pid)
break;
sleep_ms(1);
uint64_t now = current_time_ms();
uint32_t now_executed = __atomic_load_n(output_data, __ATOMIC_RELAXED);
if (executed_calls != now_executed) {
executed_calls = now_executed;
last_executed = now;
}
if ((now - start < 3 * 1000) && (now - last_executed < 500))
continue;
kill(pid, SIGKILL);
while (waitpid(pid, &status, 0) != pid) {
}
break;
}
status = WEXITSTATUS(status);
if (status == kFailStatus)
fail("child failed");
if (status == kErrorStatus)
error("child errored");
remove_dir(cwdbuf);
reply_execute(0);
}
return 0;
}

long execute_syscall(call_t* c, long a0, long a1, long a2, long a3, long a4, long a5, long a6, long a7, long a8)
{
if (c->call)
return c->call(a0, a1, a2, a3, a4, a5, a6, a7, a8);
return syscall(c->sys_nr, a0, a1, a2, a3, a4, a5);
}

void cover_open()
{
if (!flag_cover)
return;
for (int i = 0; i < kMaxThreads; i++) {
thread_t* th = &threads[i];
th->cover_data = &th->cover_buffer[0];
}
}

void cover_enable(thread_t* th)
{
}

void cover_reset(thread_t* th)
{
}

uint64_t read_cover_size(thread_t* th)
{
if (!flag_cover)
return 0;
// Fallback coverage since we have no real coverage available.
// We use syscall number or-ed with returned errno value as signal.
// At least this gives us all combinations of syscall+errno.
th->cover_data[0] = (th->call_num << 16) | ((th->res == -1 ? th->reserrno : 0) & 0x3ff);
return 1;
}

uint32_t* write_output(uint32_t v)
{
if (collide)
return 0;
if (output_pos < output_data || (char*)output_pos >= (char*)output_data + kMaxOutput)
fail("output overflow");
*output_pos = v;
return output_pos++;
}

void write_completed(uint32_t completed)
{
__atomic_store_n(output_data, completed, __ATOMIC_RELEASE);
}

bool kcov_comparison_t::ignore() const
{
return false;
}
173 changes: 0 additions & 173 deletions executor/executor_freebsd.cc

This file was deleted.

1 change: 1 addition & 0 deletions executor/executor_freebsd.cc
1 change: 1 addition & 0 deletions executor/executor_netbsd.cc
21 changes: 21 additions & 0 deletions pkg/host/host_netbsd.go
@@ -0,0 +1,21 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.

package host

import (
"github.com/google/syzkaller/prog"
)

// DetectSupportedSyscalls returns list on supported syscalls on host.
func DetectSupportedSyscalls(target *prog.Target) (map[*prog.Syscall]bool, error) {
supported := make(map[*prog.Syscall]bool)
for _, c := range target.Syscalls {
supported[c] = true
}
return supported, nil
}

func EnableFaultInjection() error {
return nil
}
2 changes: 2 additions & 0 deletions pkg/osutil/osutil_freebsd.go → pkg/osutil/osutil_bsd.go
@@ -1,6 +1,8 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.

// +build freebsd netbsd

package osutil

import (
Expand Down
2 changes: 1 addition & 1 deletion pkg/osutil/osutil_unix.go
@@ -1,7 +1,7 @@
// Copyright 2017 syzkaller project authors. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.

// +build freebsd,!appengine linux,!appengine darwin,!appengine
// +build freebsd,!appengine netbsd,!appengine linux,!appengine darwin,!appengine

package osutil

Expand Down

5 comments on commit e729550

@krytarowski
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! @utkarsh009 is now trying the syzkaller bits on NetBSD.

@dvyukov
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just replied to (I think his) email on syzkaller mailing list. I also CCed you (hope got address right). Let's continue there.

@utkarsh009
Copy link
Contributor

@utkarsh009 utkarsh009 commented on e729550 Oct 23, 2017 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krytarowski
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, great! Just saw the mail.

@utkarsh009
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just created the pull request with documentation for NetBSD: #395

Please sign in to comment.