lkml.org 
[lkml]   [2021]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 27/47] bpf, selftests: Fix up some test_verifier cases for unprivileged
    Date
    From: Piotr Krysiuk <piotras@gmail.com>

    commit 0a13e3537ea67452d549a6a80da3776d6b7dedb3 upstream.

    Fix up test_verifier error messages for the case where the original error
    message changed, or for the case where pointer alu errors differ between
    privileged and unprivileged tests. Also, add alternative tests for keeping
    coverage of the original verifier rejection error message (fp alu), and
    newly reject map_ptr += rX where rX == 0 given we now forbid alu on these
    types for unprivileged. All test_verifier cases pass after the change. The
    test case fixups were kept separate to ease backporting of core changes.

    Signed-off-by: Piotr Krysiuk <piotras@gmail.com>
    Co-developed-by: Daniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Acked-by: Alexei Starovoitov <ast@kernel.org>
    [fllinden@amazon.com: backport to 4.14, skipping non-existent tests]
    Signed-off-by: Frank van der Linden <fllinden@amazon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    tools/testing/selftests/bpf/test_verifier.c | 44 +++++++++++++++++++++-------
    1 file changed, 34 insertions(+), 10 deletions(-)

    --- a/tools/testing/selftests/bpf/test_verifier.c
    +++ b/tools/testing/selftests/bpf/test_verifier.c
    @@ -2235,7 +2235,7 @@ static struct bpf_test tests[] = {
    .result = ACCEPT,
    },
    {
    - "unpriv: adding of fp",
    + "unpriv: adding of fp, reg",
    .insns = {
    BPF_MOV64_IMM(BPF_REG_0, 0),
    BPF_MOV64_IMM(BPF_REG_1, 0),
    @@ -2243,9 +2243,22 @@ static struct bpf_test tests[] = {
    BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, -8),
    BPF_EXIT_INSN(),
    },
    - .result = ACCEPT,
    + .errstr_unpriv = "R1 tried to add from different maps, paths, or prohibited types",
    .result_unpriv = REJECT,
    + .result = ACCEPT,
    + },
    + {
    + "unpriv: adding of fp, imm",
    + .insns = {
    + BPF_MOV64_IMM(BPF_REG_0, 0),
    + BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),
    + BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0),
    + BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, -8),
    + BPF_EXIT_INSN(),
    + },
    .errstr_unpriv = "R1 stack pointer arithmetic goes out of range",
    + .result_unpriv = REJECT,
    + .result = ACCEPT,
    },
    {
    "unpriv: cmp of stack pointer",
    @@ -7766,8 +7779,9 @@ static struct bpf_test tests[] = {
    BPF_ALU64_REG(BPF_SUB, BPF_REG_0, BPF_REG_1),
    BPF_EXIT_INSN(),
    },
    - .result = REJECT,
    + .errstr_unpriv = "R0 tried to sub from different maps, paths, or prohibited types",
    .errstr = "R0 tried to subtract pointer from scalar",
    + .result = REJECT,
    },
    {
    "check deducing bounds from const, 2",
    @@ -7780,6 +7794,8 @@ static struct bpf_test tests[] = {
    BPF_ALU64_REG(BPF_SUB, BPF_REG_1, BPF_REG_0),
    BPF_EXIT_INSN(),
    },
    + .errstr_unpriv = "R1 tried to sub from different maps, paths, or prohibited types",
    + .result_unpriv = REJECT,
    .result = ACCEPT,
    },
    {
    @@ -7790,8 +7806,9 @@ static struct bpf_test tests[] = {
    BPF_ALU64_REG(BPF_SUB, BPF_REG_0, BPF_REG_1),
    BPF_EXIT_INSN(),
    },
    - .result = REJECT,
    + .errstr_unpriv = "R0 tried to sub from different maps, paths, or prohibited types",
    .errstr = "R0 tried to subtract pointer from scalar",
    + .result = REJECT,
    },
    {
    "check deducing bounds from const, 4",
    @@ -7804,6 +7821,8 @@ static struct bpf_test tests[] = {
    BPF_ALU64_REG(BPF_SUB, BPF_REG_1, BPF_REG_0),
    BPF_EXIT_INSN(),
    },
    + .errstr_unpriv = "R1 tried to sub from different maps, paths, or prohibited types",
    + .result_unpriv = REJECT,
    .result = ACCEPT,
    },
    {
    @@ -7814,8 +7833,9 @@ static struct bpf_test tests[] = {
    BPF_ALU64_REG(BPF_SUB, BPF_REG_0, BPF_REG_1),
    BPF_EXIT_INSN(),
    },
    - .result = REJECT,
    + .errstr_unpriv = "R0 tried to sub from different maps, paths, or prohibited types",
    .errstr = "R0 tried to subtract pointer from scalar",
    + .result = REJECT,
    },
    {
    "check deducing bounds from const, 6",
    @@ -7826,8 +7846,9 @@ static struct bpf_test tests[] = {
    BPF_ALU64_REG(BPF_SUB, BPF_REG_0, BPF_REG_1),
    BPF_EXIT_INSN(),
    },
    - .result = REJECT,
    + .errstr_unpriv = "R0 tried to sub from different maps, paths, or prohibited types",
    .errstr = "R0 tried to subtract pointer from scalar",
    + .result = REJECT,
    },
    {
    "check deducing bounds from const, 7",
    @@ -7839,8 +7860,9 @@ static struct bpf_test tests[] = {
    offsetof(struct __sk_buff, mark)),
    BPF_EXIT_INSN(),
    },
    - .result = REJECT,
    + .errstr_unpriv = "R1 tried to sub from different maps, paths, or prohibited types",
    .errstr = "dereference of modified ctx ptr",
    + .result = REJECT,
    },
    {
    "check deducing bounds from const, 8",
    @@ -7852,8 +7874,9 @@ static struct bpf_test tests[] = {
    offsetof(struct __sk_buff, mark)),
    BPF_EXIT_INSN(),
    },
    - .result = REJECT,
    + .errstr_unpriv = "R1 tried to add from different maps, paths, or prohibited types",
    .errstr = "dereference of modified ctx ptr",
    + .result = REJECT,
    },
    {
    "check deducing bounds from const, 9",
    @@ -7863,8 +7886,9 @@ static struct bpf_test tests[] = {
    BPF_ALU64_REG(BPF_SUB, BPF_REG_0, BPF_REG_1),
    BPF_EXIT_INSN(),
    },
    - .result = REJECT,
    + .errstr_unpriv = "R0 tried to sub from different maps, paths, or prohibited types",
    .errstr = "R0 tried to subtract pointer from scalar",
    + .result = REJECT,
    },
    {
    "check deducing bounds from const, 10",
    @@ -7876,8 +7900,8 @@ static struct bpf_test tests[] = {
    BPF_ALU64_REG(BPF_SUB, BPF_REG_0, BPF_REG_1),
    BPF_EXIT_INSN(),
    },
    - .result = REJECT,
    .errstr = "math between ctx pointer and register with unbounded min value is not allowed",
    + .result = REJECT,
    },
    {
    "XDP pkt read, pkt_end <= pkt_data', bad access 2",

    \
     
     \ /
      Last update: 2021-06-08 20:34    [W:3.028 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site