diff options
| author |   Xin Liu <liuxin350@huawei.com> | 2022-09-17 16:48:09 +0800 |
|---|---|---|
| committer |   Andrii Nakryiko <andrii@kernel.org> | 2022-09-20 17:34:09 -0700 |
| commit | 7620bffbf72cd66a5d18e444a143b5b5989efa87 (patch) | |
| tree | b2e1a3ce1f2734d69c5c536ac0b1e88eb79cc5b9 /tools/lib/bpf/btf_dump.c | |
| parent | samples/bpf: Replace blk_account_io_done() with __blk_account_io_done() (diff) | |
| download | linux-dev-7620bffbf72cd66a5d18e444a143b5b5989efa87.tar.xz linux-dev-7620bffbf72cd66a5d18e444a143b5b5989efa87.zip | |
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: 2ce8450ef5a3 ("libbpf: add bpf_object__open_{file, mem} w/ extensible opts")
Signed-off-by: Xin Liu <liuxin350@huawei.com>
Signed-off-by: Weibin Kong <kongweibin2@huawei.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220917084809.30770-1-liuxin350@huawei.com
Diffstat (limited to '')
| -rw-r--r-- | tools/lib/bpf/btf_dump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lib/bpf/btf_dump.c b/tools/lib/bpf/btf_dump.c index 627edb5bb6de..4221f73a74d0 100644 --- a/tools/lib/bpf/btf_dump.c +++ b/tools/lib/bpf/btf_dump.c @@ -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, |