diff options
author | He Fengqing <hefengqing@huawei.com> | 2021-07-14 13:18:15 +0300 |
---|---|---|
committer | Alexei Starovoitov <ast@kernel.org> | 2021-07-15 04:31:24 +0300 |
commit | 75f0fc7b48ad45a2e5736bcf8de26c8872fe8695 (patch) | |
tree | abeb89b61f020596ba339199c539b93fff3565e1 /tools | |
parent | f170acda7ffaf0473d06e1e17c12cd9fd63904f5 (diff) | |
download | linux-75f0fc7b48ad45a2e5736bcf8de26c8872fe8695.tar.xz |
bpf: Fix potential memleak and UAF in the verifier.
In bpf_patch_insn_data(), we first use the bpf_patch_insn_single() to
insert new instructions, then use adjust_insn_aux_data() to adjust
insn_aux_data. If the old env->prog have no enough room for new inserted
instructions, we use bpf_prog_realloc to construct new_prog and free the
old env->prog.
There have two errors here. First, if adjust_insn_aux_data() return
ENOMEM, we should free the new_prog. Second, if adjust_insn_aux_data()
return ENOMEM, bpf_patch_insn_data() will return NULL, and env->prog has
been freed in bpf_prog_realloc, but we will use it in bpf_check().
So in this patch, we make the adjust_insn_aux_data() never fails. In
bpf_patch_insn_data(), we first pre-malloc memory for the new
insn_aux_data, then call bpf_patch_insn_single() to insert new
instructions, at last call adjust_insn_aux_data() to adjust
insn_aux_data.
Fixes: 8041902dae52 ("bpf: adjust insn_aux_data when patching insns")
Signed-off-by: He Fengqing <hefengqing@huawei.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Song Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20210714101815.164322-1-hefengqing@huawei.com
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions