diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2018-05-10 10:09:34 -0700 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-05-11 00:20:53 +0200 |
| commit | 3597683c9da602b0440c5f742d64fa5da79cc026 (patch) | |
| tree | cd55db015c4b8b31ceadaae3dc05b9e8dba9f00f /tools/lib/bpf | |
| parent | 26aeb9daa02cd37178321cf915efd3d5eb8b0511 (diff) | |
| download | linux-3597683c9da602b0440c5f742d64fa5da79cc026.tar.gz linux-3597683c9da602b0440c5f742d64fa5da79cc026.tar.bz2 linux-3597683c9da602b0440c5f742d64fa5da79cc026.zip | |
tools: bpf: handle NULL return in bpf_prog_load_xattr()
bpf_object__open() can return error pointer as well as NULL.
Fix error handling in bpf_prog_load_xattr() (and indirectly
bpf_prog_load()).
Fixes: 6f6d33f3b3d0 ("bpf: selftests add sockmap tests")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools/lib/bpf')
| -rw-r--r-- | tools/lib/bpf/libbpf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 5922443063f0..0f9f06df49bc 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -2035,7 +2035,7 @@ int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr, return -EINVAL; obj = bpf_object__open(attr->file); - if (IS_ERR(obj)) + if (IS_ERR_OR_NULL(obj)) return -ENOENT; bpf_object__for_each_program(prog, obj) { |