diff options
| author | David S. Miller <davem@davemloft.net> | 2020-08-02 01:02:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-02 01:02:12 -0700 |
| commit | bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004 (patch) | |
| tree | 3f03062a9e759dba7b09df0feccbb58b8f7ab4cc /kernel/bpf/btf.c | |
| parent | 7126bd5c8bcbc015cf89864cf71d750e8f33f924 (diff) | |
| parent | ac3a0c8472969a03c0496ae774b3a29eb26c8d5a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Resolved kernel/bpf/btf.c using instructions from merge commit
69138b34a7248d2396ab85c8652e20c0c39beaba
Signed-off-by: David S. Miller <davem@davemloft.net>
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 ee36b7f60936..4ff0de860ab7 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -4082,7 +4082,7 @@ int btf_resolve_helper_id(struct bpf_verifier_log *log, { int id; - if (fn->arg_type[arg] != ARG_PTR_TO_BTF_ID) + if (fn->arg_type[arg] != ARG_PTR_TO_BTF_ID || !btf_vmlinux) return -EINVAL; id = fn->btf_id[arg]; if (!id || id > btf_vmlinux->nr_types) |