diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-13 21:07:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-13 21:07:02 -0400 |
| commit | 9d6b4bfb59a036d0da6406295481cdb3a5f4ffba (patch) | |
| tree | e205961458f1bd80e7ca30453c96eb5f678914cd /tools | |
| parent | 4f6b15c3a604c0addf1607c5482c46a0a5123066 (diff) | |
| parent | 3597683c9da602b0440c5f742d64fa5da79cc026 (diff) | |
| download | op-kernel-dev-9d6b4bfb59a036d0da6406295481cdb3a5f4ffba.zip op-kernel-dev-9d6b4bfb59a036d0da6406295481cdb3a5f4ffba.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-05-14
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix nfp to allow zero-length BPF capabilities, meaning the nfp
capability parsing loop will otherwise exit early if the last
capability is zero length and therefore driver will fail to probe
with an error such as:
nfp: BPF capabilities left after parsing, parsed:92 total length:100
nfp: invalid BPF capabilities at offset:92
Fix from Jakub.
2) libbpf's bpf_object__open() may return IS_ERR_OR_NULL() and not
just an error. Fix libbpf's bpf_prog_load_xattr() to handle that
case as well, also from Jakub.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools')
| -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 5922443..0f9f06d 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) { |
