diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-07-13 16:37:36 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-07-15 09:26:23 +0200 |
| commit | 13d5e89e029784d9dba5e93d3be71af08cdfd502 (patch) | |
| tree | 49a4e42f8043e2c447f3e3e3c12002dae2adbf93 /executor/common_kvm_arm64.h | |
| parent | b458f2c1a61c78e2004be6b4ef60b45fb81bd684 (diff) | |
executor: remove NONFAILING from pseudo-syscalls
This is not needed anymore afer the previous commit.
Fixes #1918
Diffstat (limited to 'executor/common_kvm_arm64.h')
| -rw-r--r-- | executor/common_kvm_arm64.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/executor/common_kvm_arm64.h b/executor/common_kvm_arm64.h index 4b536929f..beb794a79 100644 --- a/executor/common_kvm_arm64.h +++ b/executor/common_kvm_arm64.h @@ -36,12 +36,9 @@ static long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long const uintptr_t guest_mem_size = 24 * page_size; (void)text_count; // fuzzer can spoof count and we need just 1 text, so ignore text_count - int text_type = 0; - const void* text = 0; - int text_size = 0; - NONFAILING(text_type = text_array_ptr[0].typ); - NONFAILING(text = text_array_ptr[0].text); - NONFAILING(text_size = text_array_ptr[0].size); + int text_type = text_array_ptr[0].typ; + const void* text = text_array_ptr[0].text; + int text_size = text_array_ptr[0].size; (void)text_type; (void)opt_array_ptr; @@ -50,10 +47,8 @@ static long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long opt_count = 1; uintptr_t i; for (i = 0; i < opt_count; i++) { - uint64 typ = 0; - uint64 val = 0; - NONFAILING(typ = opt_array_ptr[i].typ); - NONFAILING(val = opt_array_ptr[i].val); + uint64 typ = opt_array_ptr[i].typ; + uint64 val = opt_array_ptr[i].val; switch (typ) { case 1: features = val; @@ -78,7 +73,7 @@ static long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volatile long if (text_size > 1000) text_size = 1000; - NONFAILING(memcpy(host_mem, text, text_size)); + memcpy(host_mem, text, text_size); return 0; } |