libbpf: fix realloc API handling in zero-sized edge cases
Andrii Nakryiko
maintainerPATCH 1/1 libbpf: fix realloc API handling in zero-sized edge cases
realloc() and reallocarray() can either return NULL or a special non-NULL pointer, if their size argument is zero. This requires a bit more care to handle NULL-as-valid-result situation differently from NULL-as-error case. This has caused real issues before ([0]), and just recently bit again in production when performing bpf_program__attach_usdt().
This patch fixes 4 places that do or potentially could suffer from this mishandling of NULL, including the reported USDT-related one.
There are many other places where realloc()/reallocarray() is used and NULL is always treated as an error value, but all those have guarantees that their size is always non-zero, so those spot don't need any extra handling.
[0] d08ab82f59d5 ("libbpf: Fix double-free when linker processes empty sections")
--- tools/lib/bpf/libbpf.c | 15 ++++++++++++--- tools/lib/bpf/usdt.c | 5 ++++- 2 files changed, 16 insertions(+), 4 deletions(-)
tools/lib/bpf/libbpf.c +12 -3
@@ -6161,7 +6161,11 @@ static int append_subprog_relos(struct bpf_program *main_prog, struct bpf_prograif (main_prog == subprog)return 0 ; relos =libbpf_reallocarray (main_prog->reloc_desc, new_cnt,sizeof (*relos)); -if (!relos) +/* if new count is zero, reallocarray can return a valid NULL result; +* in this case the previous pointer will be freed, so we *have to* +* reassign old pointer to the new value (even if it's NULL) +*/ +if (!relos && new_cnt)return -ENOMEM ;if (subprog->nr_reloc) memcpy(relos + main_prog->nr_reloc, subprog->reloc_desc,
@@ -8532,7 +8536,8 @@ int bpf_program__set_insns(struct bpf_program *prog,return -EBUSY ; insns =libbpf_reallocarray (prog->insns, new_insn_cnt,sizeof (*insns)); -if (!insns) { +/* NULL is a valid return from reallocarray if the new count is zero */ +if (!insns && new_insn_cnt) {pr_warn ("prog '%s': failed to realloc prog code\n" , prog->name);return -ENOMEM ; }
@@ -8841,7 +8846,11 @@ int libbpf_unregister_prog_handler(int handler_id)/* try to shrink the array, but it's ok if we couldn't */ sec_defs =libbpf_reallocarray (custom_sec_defs, custom_sec_def_cnt,sizeof (*sec_defs)); -if (sec_defs) +/* if new count is zero, reallocarray can return a valid NULL result; +* in this case the previous pointer will be freed, so we *have to* +* reassign old pointer to the new value (even if it's NULL) +*/ +if (sec_defs || custom_sec_def_cnt ==0 ) custom_sec_defs = sec_defs;return 0 ;
tools/lib/bpf/usdt.c +4 -1
@@ -852,8 +852,11 @@ static int bpf_link_usdt_detach(struct bpf_link *link)* system is so exhausted on memory, it's the least of user's * concerns, probably. * So just do our best here to return those IDs to usdt_manager. +* Another edge case when we can legitimately get NULL is when +* new_cnt is zero, which can happen in some edge cases, so we +* need to be careful about that. */ -if (new_free_ids) { +if (new_free_ids || new_cnt ==0 ) {memcpy (new_free_ids + man->free_spec_cnt, usdt_link->spec_ids, usdt_link->spec_cnt *sizeof (*usdt_link->spec_ids)); man->free_spec_ids = new_free_ids;
Signature · 1 line
2.34.1
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 10 lines · On Mon, 10 Jul 2023 19:41:50 -0700 you wrote:
realloc()andreallocarray()can either return NULL or a special non-NULL pointer, if their size argument is zero. This requires a bit more care to handle NULL-as-valid-result situation differently from NULL-as-error case. This has caused real issues before ([0]), and just recently bit again in production when performingbpf_program__attach_usdt().This patch fixes 4 places that do or potentially could suffer from this mishandling of NULL, including the reported USDT-related one.
[...]
Here is the summary with links:
- [bpf-next] libbpf: fix realloc API handling in zero-sized edge cases
https://git.kernel.org/bpf/bpf-next/c/8a0260dbf655
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html