Commit 7620bffb authored by Xin Liu's avatar Xin Liu Committed by Andrii Nakryiko
Browse files

libbpf: Fix NULL pointer exception in API btf_dump__dump_type_data 



We found that function btf_dump__dump_type_data can be called by the
user as an API, but in this function, the `opts` parameter may be used
as a null pointer.This causes `opts->indent_str` to trigger a NULL
pointer exception.

Fixes: 2ce8450e ("libbpf: add bpf_object__open_{file, mem} w/ extensible opts")
Signed-off-by: default avatarXin Liu <liuxin350@huawei.com>
Signed-off-by: default avatarWeibin Kong <kongweibin2@huawei.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220917084809.30770-1-liuxin350@huawei.com
parent bc069da6

tools/lib/bpf/btf_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -2385,7 +2385,7 @@ int btf_dump__dump_type_data(struct btf_dump *d, __u32 id, 
	d->typed_dump->indent_lvl = OPTS_GET(opts, indent_level, 0);



	/* default indent string is a tab */

	if (!opts->indent_str)

	if (!OPTS_GET(opts, indent_str, NULL))

		d->typed_dump->indent_str[0] = '\t';

	else

		libbpf_strlcpy(d->typed_dump->indent_str, opts->indent_str,