libbpf: fix potential uninit memory read
Andrii Nakryiko
maintainerPATCH 1/1 libbpf: fix potential uninit memory read
In case of BPF_CORE_TYPE_ID_LOCAL we fill out target result explicitly. But targ_res itself isn't initialized in such a case, and subsequent call to bpf_core_patch_insn() might read uninitialized field (like fail_memsz_adjust in this case). So ensure that targ_res is zero-initialized for BPF_CORE_TYPE_ID_LOCAL case.
This was reported by Coverity static analyzer.
--- tools/lib/bpf/relo_core.c | 1 + 1 file changed, 1 insertion(+)
tools/lib/bpf/relo_core.c +1 -0
@@ -1223,6 +1223,7 @@ int bpf_core_apply_relo_insn(const char *prog_name, struct bpf_insn *insn,/* TYPE_ID_LOCAL relo is special and doesn't need candidate search */ if (relo->kind ==BPF_CORE_TYPE_ID_LOCAL ) {/* bpf_insn's imm value could get out of sync during linking */ +memset (&targ_res,0 ,sizeof (targ_res)); targ_res.validate = false; targ_res.poison = false; targ_res.orig_val = local_spec->root_type_id;
Signature · 1 line
2.30.2
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 9 lines · On Mon, 13 Dec 2021 17:00:32 -0800 you wrote:
In case of
BPF_CORE_TYPE_ID_LOCALwe fill out target result explicitly. Buttarg_resitself isn't initialized in such a case, and subsequent call tobpf_core_patch_insn()might read uninitialized field (likefail_memsz_adjustin this case). So ensure thattarg_resis zero-initialized forBPF_CORE_TYPE_ID_LOCALcase.This was reported by Coverity static analyzer.
[...]
Here is the summary with links:
- [bpf-next] libbpf: fix potential uninit memory read
https://git.kernel.org/bpf/bpf-next/c/4581e676d3be
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html