Skip to content

Commit 384d7d4

Browse files
jrfastabkernel-patches-bot
authored andcommitted
bpf: map_poke_descriptor is being called with an unstable poke_tab[]
When populating poke_tab[] of a subprog we call map_poke_track() after doing bpf_jit_add_poke_descriptor(). But, bpf_jit_add_poke_descriptor() may, likely will, realloc the poke_tab[] structure and free the old one. So that prog->aux->poke_tab is not stable. However, the aux pointer is referenced from bpf_array_aux and poke_tab[] is used to 'track' prog<->map link. This way when progs are released the entry in the map is dropped and vice versa when the map is released we don't drop it too soon if a prog is in the process of calling it. I wasn't able to trigger any errors here, for example having map_poke_run run with a poke_tab[] pointer that was free'd from bpf_jit_add_poke_descriptor(), but it looks possible and at very least is very fragile. This patch moves poke_track call out of loop that is calling add_poke so that we only ever add stable aux->poke_tab pointers to the map's bpf_array_aux struct. Further, we need this in the next patch to fix a real bug where progs are not 'untracked'. Signed-off-by: John Fastabend <[email protected]>
1 parent f46447d commit 384d7d4

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

kernel/bpf/verifier.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12126,8 +12126,12 @@ static int jit_subprogs(struct bpf_verifier_env *env)
1212612126
}
1212712127

1212812128
func[i]->insnsi[insn_idx - subprog_start].imm = ret + 1;
12129+
}
1212912130

12130-
map_ptr = func[i]->aux->poke_tab[ret].tail_call.map;
12131+
for (j = 0; j < func[i]->aux->size_poke_tab; j++) {
12132+
int ret;
12133+
12134+
map_ptr = func[i]->aux->poke_tab[j].tail_call.map;
1213112135
ret = map_ptr->ops->map_poke_track(map_ptr, func[i]->aux);
1213212136
if (ret < 0) {
1213312137
verbose(env, "tracking tail call prog failed\n");

0 commit comments

Comments
 (0)