summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-11-03 11:06:21 (GMT)
committerPaolo Bonzini <pbonzini@redhat.com>2014-11-03 11:06:21 (GMT)
commit123b2dd10b4659911ef38458573a57f94cbf5448 (patch)
tree536765a44b6fb25f024a8387f4677f994015b041 /samples
parentf62c95fd4041d669159dd76ac0bb2a7f86b5b05d (diff)
parent0df1f2487d2f0d04703f142813d53615d62a1da4 (diff)
downloadlinux-123b2dd10b4659911ef38458573a57f94cbf5448.tar.xz
Merge remote-tracking branch 'origin/master' into HEAD
Several important fixes went in between 3.18-rc1 and 3.18-rc3, so KVM/x86 work for 3.19 will be based on 3.18-rc3.
Diffstat (limited to 'samples')
-rw-r--r--samples/bpf/test_verifier.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/samples/bpf/test_verifier.c b/samples/bpf/test_verifier.c
index f44ef11..eb4bec0 100644
--- a/samples/bpf/test_verifier.c
+++ b/samples/bpf/test_verifier.c
@@ -209,6 +209,17 @@ static struct bpf_test tests[] = {
.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",
.insns = {
BPF_ST_MEM(BPF_DW, BPF_REG_10, 8, 0),