diff options
| author |   Grant Seltzer <grantseltzer@gmail.com> | 2022-04-20 12:12:25 -0400 |
|---|---|---|
| committer |   Daniel Borkmann <daniel@iogearbox.net> | 2022-04-21 16:28:25 +0200 |
| commit | df286716321350d1ca370d5737acf5a10b20ee9e (patch) | |
| tree | 9c434dec59f4683fbdae6672ae3d0cb35d6fb043 /tools/lib/bpf/libbpf.c | |
| parent | libbpf: Add error returns to two API functions (diff) | |
| download | linux-dev-df286716321350d1ca370d5737acf5a10b20ee9e.tar.xz linux-dev-df286716321350d1ca370d5737acf5a10b20ee9e.zip | |
libbpf: Update API functions usage to check error
This updates usage of the following API functions within
libbpf so their newly added error return is checked:
- bpf_program__set_expected_attach_type()
- bpf_program__set_type()
Signed-off-by: Grant Seltzer <grantseltzer@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20220420161226.86803-2-grantseltzer@gmail.com
Diffstat (limited to '')
| -rw-r--r-- | tools/lib/bpf/libbpf.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 342340aee948..94940497354b 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -7016,8 +7016,8 @@ static int bpf_object_init_progs(struct bpf_object *obj, const struct bpf_object continue; } - bpf_program__set_type(prog, prog->sec_def->prog_type); - bpf_program__set_expected_attach_type(prog, prog->sec_def->expected_attach_type); + prog->type = prog->sec_def->prog_type; + prog->expected_attach_type = prog->sec_def->expected_attach_type; #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" @@ -8582,8 +8582,7 @@ int bpf_program__set_##NAME(struct bpf_program *prog) \ { \ if (!prog) \ return libbpf_err(-EINVAL); \ - bpf_program__set_type(prog, TYPE); \ - return 0; \ + return bpf_program__set_type(prog, TYPE); \ } \ \ bool bpf_program__is_##NAME(const struct bpf_program *prog) \ @@ -9690,9 +9689,8 @@ static int bpf_prog_load_xattr2(const struct bpf_prog_load_attr *attr, * bpf_object__open guessed */ if (attr->prog_type != BPF_PROG_TYPE_UNSPEC) { - bpf_program__set_type(prog, attr->prog_type); - bpf_program__set_expected_attach_type(prog, - attach_type); + prog->type = attr->prog_type; + prog->expected_attach_type = attach_type; } if (bpf_program__type(prog) == BPF_PROG_TYPE_UNSPEC) { /* |