|
 |
cab4ad |
From 6adc7dbeccecff18357751b9eecfa232ee8a8172 Mon Sep 17 00:00:00 2001
|
|
|
cab4ad |
From: Serhei Makarov <smakarov@redhat.com>
|
|
|
cab4ad |
Date: Tue, 13 Nov 2018 11:42:46 -0500
|
|
|
cab4ad |
Subject: [PATCH 29/32] PR23860 bpf_interpret() :: NEG should not fall through
|
|
|
cab4ad |
to DIV
|
|
|
cab4ad |
|
|
|
cab4ad |
---
|
|
|
cab4ad |
stapbpf/bpfinterp.cxx | 26 ++++++++++++++++++--------
|
|
|
cab4ad |
1 file changed, 18 insertions(+), 8 deletions(-)
|
|
|
cab4ad |
|
|
|
cab4ad |
diff --git a/stapbpf/bpfinterp.cxx b/stapbpf/bpfinterp.cxx
|
|
|
cab4ad |
index 13ac8ee71..2a90c24c9 100644
|
|
|
cab4ad |
--- a/stapbpf/bpfinterp.cxx
|
|
|
cab4ad |
+++ b/stapbpf/bpfinterp.cxx
|
|
|
cab4ad |
@@ -254,18 +254,23 @@ bpf_interpret(size_t ninsns, const struct bpf_insn insns[],
|
|
|
cab4ad |
case BPF_ALU64 | BPF_MOV | BPF_K: dr = s1; break;
|
|
|
cab4ad |
case BPF_ALU64 | BPF_ARSH | BPF_X:
|
|
|
cab4ad |
case BPF_ALU64 | BPF_ARSH | BPF_K: dr = (int64_t)dr >> s1; break;
|
|
|
cab4ad |
- case BPF_ALU64 | BPF_NEG: dr = -sr;
|
|
|
cab4ad |
- /* Fallthrough */
|
|
|
cab4ad |
+ case BPF_ALU64 | BPF_NEG: dr = -sr; break;
|
|
|
cab4ad |
case BPF_ALU64 | BPF_DIV | BPF_X:
|
|
|
cab4ad |
case BPF_ALU64 | BPF_DIV | BPF_K:
|
|
|
cab4ad |
if (s1 == 0)
|
|
|
cab4ad |
- return 0;
|
|
|
cab4ad |
+ {
|
|
|
cab4ad |
+ // TODO: Signal a proper error.
|
|
|
cab4ad |
+ return 0;
|
|
|
cab4ad |
+ }
|
|
|
cab4ad |
dr /= s1;
|
|
|
cab4ad |
break;
|
|
|
cab4ad |
case BPF_ALU64 | BPF_MOD | BPF_X:
|
|
|
cab4ad |
case BPF_ALU64 | BPF_MOD | BPF_K:
|
|
|
cab4ad |
if (s1 == 0)
|
|
|
cab4ad |
- return 0;
|
|
|
cab4ad |
+ {
|
|
|
cab4ad |
+ // TODO: Signal a proper error.
|
|
|
cab4ad |
+ return 0;
|
|
|
cab4ad |
+ }
|
|
|
cab4ad |
dr %= s1;
|
|
|
cab4ad |
break;
|
|
|
cab4ad |
|
|
|
cab4ad |
@@ -289,18 +294,23 @@ bpf_interpret(size_t ninsns, const struct bpf_insn insns[],
|
|
|
cab4ad |
case BPF_ALU | BPF_MOV | BPF_K: dr = (uint32_t)s1; break;
|
|
|
cab4ad |
case BPF_ALU | BPF_ARSH | BPF_X:
|
|
|
cab4ad |
case BPF_ALU | BPF_ARSH | BPF_K: dr = (int32_t)dr >> s1; break;
|
|
|
cab4ad |
- case BPF_ALU | BPF_NEG: dr = -(uint32_t)sr;
|
|
|
cab4ad |
- /* Fallthrough */
|
|
|
cab4ad |
+ case BPF_ALU | BPF_NEG: dr = -(uint32_t)sr; break;
|
|
|
cab4ad |
case BPF_ALU | BPF_DIV | BPF_X:
|
|
|
cab4ad |
case BPF_ALU | BPF_DIV | BPF_K:
|
|
|
cab4ad |
if ((uint32_t)s1 == 0)
|
|
|
cab4ad |
- return 0;
|
|
|
cab4ad |
+ {
|
|
|
cab4ad |
+ // TODO: Signal a proper error.
|
|
|
cab4ad |
+ return 0;
|
|
|
cab4ad |
+ }
|
|
|
cab4ad |
dr = (uint32_t)dr / (uint32_t)s1;
|
|
|
cab4ad |
break;
|
|
|
cab4ad |
case BPF_ALU | BPF_MOD | BPF_X:
|
|
|
cab4ad |
case BPF_ALU | BPF_MOD | BPF_K:
|
|
|
cab4ad |
if ((uint32_t)s1 == 0)
|
|
|
cab4ad |
- return 0;
|
|
|
cab4ad |
+ {
|
|
|
cab4ad |
+ // TODO: Signal a proper error.
|
|
|
cab4ad |
+ return 0;
|
|
|
cab4ad |
+ }
|
|
|
cab4ad |
dr = (uint32_t)dr % (uint32_t)s1;
|
|
|
cab4ad |
break;
|
|
|
cab4ad |
|
|
|
cab4ad |
--
|
|
|
cab4ad |
2.14.5
|
|
|
cab4ad |
|