diff options
| author | Martin KaFai Lau <martin.lau@kernel.org> | 2023-03-06 11:44:14 -0800 |
|---|---|---|
| committer | Martin KaFai Lau <martin.lau@kernel.org> | 2023-03-06 11:44:14 -0800 |
| commit | 32dfc59e43019e43deab7afbfff37a2f9f17a222 (patch) | |
| tree | 2f977313a173fb86ce507d69611754b08ea576e2 /kernel | |
| parent | 294635a8165a31408a8b3a24f9c74849ca3d8701 (diff) | |
| parent | dfdd608c3b365f0fd49d7e13911ebcde06b9865b (diff) | |
| download | linux-32dfc59e43019e43deab7afbfff37a2f9f17a222.tar.gz linux-32dfc59e43019e43deab7afbfff37a2f9f17a222.tar.bz2 linux-32dfc59e43019e43deab7afbfff37a2f9f17a222.zip | |
Merge branch 'fix resolving VAR after DATASEC'
Lorenz Bauer says:
====================
See the first patch for a detailed explanation.
v2:
- Move RESOLVE_TBD assignment out of the loop (Martin)
====================
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bpf/btf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index fa22ec79ac0e..73780748404c 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -4569,6 +4569,7 @@ static int btf_datasec_resolve(struct btf_verifier_env *env, struct btf *btf = env->btf; u16 i; + env->resolve_mode = RESOLVE_TBD; for_each_vsi_from(i, v->next_member, v->t, vsi) { u32 var_type_id = vsi->type, type_id, type_size = 0; const struct btf_type *var_type = btf_type_by_id(env->btf, |