On 11/21/2018 10:53 PM, Jakub Kicinski wrote:
> This patch fixes a possible null pointer dereference in
> do_load, detected by the semantic patch deref_null.cocci,
> with the following warning:
>
> ./tools/bpf/bpftool/prog.c:1021:23-25: ERROR: map_replace is NULL but
> dereferenced.
>
> The following code has potential null pointer references:
> 881 map_replace = reallocarray(map_replace, old_map_fds + 1,
> 882 sizeof(*map_replace));
> 883 if (!map_replace) {
> 884 p_err("mem alloc failed");
> 885 goto err_free_reuse_maps;
> 886 }
>
> ...
> 1019 err_free_reuse_maps:
> 1020 for (i = 0; i < old_map_fds; i++)
> 1021 close(map_replace[i].fd);
> 1022 free(map_replace);
>
> Fixes: 3ff5a4dc5d89 ("tools: bpftool: allow reuse of maps with bpftool prog
> load")
> Co-developed-by: Wen Yang <[email protected]>
> Signed-off-by: Wen Yang <[email protected]>
> Signed-off-by: Jakub Kicinski <[email protected]>
Applied to bpf, thanks everyone!
