diff options
| -rw-r--r-- | kernel/bpf/verifier.c | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index bb4b5405d1a5..47bb3eee950c 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -2107,41 +2107,6 @@ static void convert_pseudo_ld_imm64(struct verifier_env *env) insn->src_reg = 0; } -/* single env->prog->insni[off] instruction was replaced with the range - * insni[off, off + cnt). Adjust corresponding insn_aux_data by copying - * [0, off) and [off, end) to new locations, so the patched range stays zero - */ -static int adjust_insn_aux_data(struct verifier_env *env, u32 prog_len, - u32 off, u32 cnt) -{ - struct bpf_insn_aux_data *new_data, *old_data = env->insn_aux_data; - - if (cnt == 1) - return 0; - new_data = vzalloc(sizeof(struct bpf_insn_aux_data) * prog_len); - if (!new_data) - return -ENOMEM; - memcpy(new_data, old_data, sizeof(struct bpf_insn_aux_data) * off); - memcpy(new_data + off + cnt - 1, old_data + off, - sizeof(struct bpf_insn_aux_data) * (prog_len - off - cnt + 1)); - env->insn_aux_data = new_data; - vfree(old_data); - return 0; -} - -static struct bpf_prog *bpf_patch_insn_data(struct verifier_env *env, u32 off, - const struct bpf_insn *patch, u32 len) -{ - struct bpf_prog *new_prog; - - new_prog = bpf_patch_insn_single(env->prog, off, patch, len); - if (!new_prog) - return NULL; - if (adjust_insn_aux_data(env, new_prog->len, off, len)) - return NULL; - return new_prog; -} - /* convert load instructions that access fields of 'struct __sk_buff' * into sequence of instructions that access fields of 'struct sk_buff' */ @@ -2167,7 +2132,7 @@ static int convert_ctx_accesses(struct verifier_env *env) else continue; - if (env->insn_aux_data[i + delta].ptr_type != PTR_TO_CTX) + if (env->insn_aux_data[i].ptr_type != PTR_TO_CTX) continue; cnt = env->prog->aux->ops-> @@ -2178,7 +2143,8 @@ static int convert_ctx_accesses(struct verifier_env *env) return -EINVAL; } - new_prog = bpf_patch_insn_data(env, i + delta, insn_buf, cnt); + new_prog = bpf_patch_insn_single(env->prog, i + delta, insn_buf, + cnt); if (!new_prog) return -ENOMEM; |