app/testpmd: fix build for 16-byte Rx descriptor mode

[dpdk.git] / lib / librte_bpf / bpf_validate.c

diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
index 83983ef..0cf41fa 100644 (file)
--- a/lib/librte_bpf/bpf_validate.c
+++ b/lib/librte_bpf/bpf_validate.c
@@ -925,7 +925,6 @@ eval_func_arg(struct bpf_verifier *bvf, const struct rte_bpf_arg *arg,
 static const char *
 eval_call(struct bpf_verifier *bvf, const struct ebpf_insn *ins)
 {
-       uint64_t msk;
        uint32_t i, idx;
        struct bpf_reg_val *rv;
        const struct rte_bpf_xsym *xsym;
@@ -958,10 +957,11 @@ eval_call(struct bpf_verifier *bvf, const struct ebpf_insn *ins)
 
        rv = bvf->evst->rv + EBPF_REG_0;
        rv->v = xsym->func.ret;
-       msk = (rv->v.type == RTE_BPF_ARG_RAW) ?
-               RTE_LEN2MASK(rv->v.size * CHAR_BIT, uint64_t) : UINTPTR_MAX;
-       eval_max_bound(rv, msk);
-       rv->mask = msk;
+       if (rv->v.type == RTE_BPF_ARG_RAW)
+               eval_fill_max_bound(rv,
+                       RTE_LEN2MASK(rv->v.size * CHAR_BIT, uint64_t));
+       else if (RTE_BPF_ARG_PTR_TYPE(rv->v.type) != 0)
+               eval_fill_imm64(rv, UINTPTR_MAX, 0);
 
        return err;
 }
@@ -1084,7 +1084,7 @@ eval_jcc(struct bpf_verifier *bvf, const struct ebpf_insn *ins)
 /*
  * validate parameters for each instruction type.
  */
-static const struct bpf_ins_check ins_chk[UINT8_MAX] = {
+static const struct bpf_ins_check ins_chk[UINT8_MAX + 1] = {
        /* ALU IMM 32-bit instructions */
        [(BPF_ALU | BPF_ADD | BPF_K)] = {
                .mask = {.dreg = WRT_REGS, .sreg = ZERO_REG},