diff options
| author | David S. Miller <davem@davemloft.net> | 2021-03-21 01:18:06 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-21 01:18:06 +0300 |
| commit | e56c53d1946b75bdb7752f1fd7e6a62fee2459d9 (patch) | |
| tree | 2eda9618222b175c841773a05b4d3f25768f6583 /tools/lib/bpf/btf_dump.c | |
| parent | 5aa3c334a449bab24519c4967f5ac2b3304c8dcf (diff) | |
| parent | b9082970478009b778aa9b22d5561eef35b53b63 (diff) | |
| download | linux-e56c53d1946b75bdb7752f1fd7e6a62fee2459d9.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2021-03-20
The following pull-request contains BPF updates for your *net* tree.
We've added 5 non-merge commits during the last 3 day(s) which contain
a total of 8 files changed, 155 insertions(+), 12 deletions(-).
The main changes are:
1) Use correct nops in fexit trampoline, from Stanislav.
2) Fix BTF dump, from Jean-Philippe.
3) Fix umd memory leak, from Zqiang.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/lib/bpf/btf_dump.c')
| -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 2f9d685bd522..0911aea4cdbe 100644 --- a/tools/lib/bpf/btf_dump.c +++ b/tools/lib/bpf/btf_dump.c @@ -462,7 +462,7 @@ static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr) return err; case BTF_KIND_ARRAY: - return btf_dump_order_type(d, btf_array(t)->type, through_ptr); + return btf_dump_order_type(d, btf_array(t)->type, false); case BTF_KIND_STRUCT: case BTF_KIND_UNION: { |