diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-01-20 12:16:11 -0800 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-20 12:16:11 -0800 |
commit | 0fe2f273ab892bbba3f8d85e3f237bc0802e5709 (patch) | |
tree | c0194aaa4d716cd49909176885bf498dd6de8cd4 /kernel/bpf/btf.c | |
parent | bonding: add a vlan+srcmac tx hashing option (diff) | |
parent | Merge tag 'net-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
download | linux-dev-0fe2f273ab892bbba3f8d85e3f237bc0802e5709.tar.xz linux-dev-0fe2f273ab892bbba3f8d85e3f237bc0802e5709.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/can/dev.c
commit 03f16c5075b2 ("can: dev: can_restart: fix use after free bug")
commit 3e77f70e7345 ("can: dev: move driver related infrastructure into separate subdir")
Code move.
drivers/net/dsa/b53/b53_common.c
commit 8e4052c32d6b ("net: dsa: b53: fix an off by one in checking "vlan->vid"")
commit b7a9e0da2d1c ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects")
Field rename.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'kernel/bpf/btf.c')
-rw-r--r-- | kernel/bpf/btf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 7ccc0133723a..8962f988514f 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -4172,7 +4172,7 @@ static int btf_parse_hdr(struct btf_verifier_env *env) return -ENOTSUPP; } - if (btf_data_size == hdr->hdr_len) { + if (!btf->base_btf && btf_data_size == hdr->hdr_len) { btf_verifier_log(env, "No data"); return -EINVAL; } |