diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-19 16:42:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-19 16:42:35 -0800 |
| commit | 41f57cfde186dba6e357f9db25eafbed017e4487 (patch) | |
| tree | e5f3ab80902a1f921341d7846fbe956695fda351 /kernel/bpf/offload.c | |
| parent | fca07a937a27e720df7310bc5e68a11e5d2ff3c5 (diff) | |
| parent | b9aff38de2cb166476988020428985c5f7412ffc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2020-02-19
The following pull-request contains BPF updates for your *net* tree.
We've added 10 non-merge commits during the last 10 day(s) which contain
a total of 10 files changed, 93 insertions(+), 31 deletions(-).
The main changes are:
1) batched bpf hashtab fixes from Brian and Yonghong.
2) various selftests and libbpf fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/offload.c')
| -rw-r--r-- | kernel/bpf/offload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index 2c5dc6541ece..bd09290e3648 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -321,7 +321,7 @@ int bpf_prog_offload_info_fill(struct bpf_prog_info *info, ulen = info->jited_prog_len; info->jited_prog_len = aux->offload->jited_len; - if (info->jited_prog_len & ulen) { + if (info->jited_prog_len && ulen) { uinsns = u64_to_user_ptr(info->jited_prog_insns); ulen = min_t(u32, info->jited_prog_len, ulen); if (copy_to_user(uinsns, aux->offload->jited_image, ulen)) { |