iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpf: fix bug in eBPF verifier

Browse Source 
while comparing for verifier state equivalency the comparison
was missing a check for uninitialized register.
Make sure it does so and add a testcase.

Fixes: f1bca824da ("bpf: add search pruning optimization to verifier")
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexei Starovoitov 2014-10-20 14:54:57 -07:00 committed by David S. Miller
parent 78fd1d0ab0
commit 32bf08a625
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/bpf/verifier.c
View File

@ -1409,7 +1409,8 @@ static bool states_equal(struct verifier_state *old, struct verifier_state *cur)
if (memcmp(&old->regs[i], &cur->regs[i], if (memcmp(&old->regs[i], &cur->regs[i],
sizeof(old->regs[0])) != 0) { sizeof(old->regs[0])) != 0) {
if (old->regs[i].type == NOT_INIT || if (old->regs[i].type == NOT_INIT ||
old->regs[i].type == UNKNOWN_VALUE) (old->regs[i].type == UNKNOWN_VALUE &&
cur->regs[i].type != NOT_INIT))
continue; continue;
return false; return false;
} }

11
samples/bpf/test_verifier.c
View File

@ -208,6 +208,17 @@ static struct bpf_test tests[] = {
.errstr = "R0 !read_ok", .errstr = "R0 !read_ok",
.result = REJECT, .result = REJECT,
}, },
{
"program doesn't init R0 before exit in all branches",
.insns = {
BPF_JMP_IMM(BPF_JGE, BPF_REG_1, 0, 2),
BPF_MOV64_IMM(BPF_REG_0, 1),
BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 2),
BPF_EXIT_INSN(),
},
.errstr = "R0 !read_ok",
.result = REJECT,
},
{ {
"stack out of bounds", "stack out of bounds",
.insns = { .insns = {