Skip to content

Commit 7f6e431

Browse files
mfijalkoAlexei Starovoitov
authored andcommitted
bpf: Limit caller's stack depth 256 for subprogs with tailcalls
Protect against potential stack overflow that might happen when bpf2bpf calls get combined with tailcalls. Limit the caller's stack depth for such case down to 256 so that the worst case scenario would result in 8k stack size (32 which is tailcall limit * 256 = 8k). Suggested-by: Alexei Starovoitov <[email protected]> Signed-off-by: Maciej Fijalkowski <[email protected]> Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent cf71b17 commit 7f6e431

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

include/linux/bpf_verifier.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ struct bpf_subprog_info {
358358
u32 start; /* insn idx of function entry point */
359359
u32 linfo_idx; /* The idx to the main_prog->aux->linfo */
360360
u16 stack_depth; /* max. stack depth used by this function */
361+
bool has_tail_call;
361362
};
362363

363364
/* single container for all structs

kernel/bpf/verifier.c

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,6 +1490,10 @@ static int check_subprogs(struct bpf_verifier_env *env)
14901490
for (i = 0; i < insn_cnt; i++) {
14911491
u8 code = insn[i].code;
14921492

1493+
if (code == (BPF_JMP | BPF_CALL) &&
1494+
insn[i].imm == BPF_FUNC_tail_call &&
1495+
insn[i].src_reg != BPF_PSEUDO_CALL)
1496+
subprog[cur_subprog].has_tail_call = true;
14931497
if (BPF_CLASS(code) != BPF_JMP && BPF_CLASS(code) != BPF_JMP32)
14941498
goto next;
14951499
if (BPF_OP(code) == BPF_EXIT || BPF_OP(code) == BPF_CALL)
@@ -2983,6 +2987,31 @@ static int check_max_stack_depth(struct bpf_verifier_env *env)
29832987
int ret_prog[MAX_CALL_FRAMES];
29842988

29852989
process_func:
2990+
/* protect against potential stack overflow that might happen when
2991+
* bpf2bpf calls get combined with tailcalls. Limit the caller's stack
2992+
* depth for such case down to 256 so that the worst case scenario
2993+
* would result in 8k stack size (32 which is tailcall limit * 256 =
2994+
* 8k).
2995+
*
2996+
* To get the idea what might happen, see an example:
2997+
* func1 -> sub rsp, 128
2998+
* subfunc1 -> sub rsp, 256
2999+
* tailcall1 -> add rsp, 256
3000+
* func2 -> sub rsp, 192 (total stack size = 128 + 192 = 320)
3001+
* subfunc2 -> sub rsp, 64
3002+
* subfunc22 -> sub rsp, 128
3003+
* tailcall2 -> add rsp, 128
3004+
* func3 -> sub rsp, 32 (total stack size 128 + 192 + 64 + 32 = 416)
3005+
*
3006+
* tailcall will unwind the current stack frame but it will not get rid
3007+
* of caller's stack as shown on the example above.
3008+
*/
3009+
if (idx && subprog[idx].has_tail_call && depth >= 256) {
3010+
verbose(env,
3011+
"tail_calls are not allowed when call stack of previous frames is %d bytes. Too large\n",
3012+
depth);
3013+
return -EACCES;
3014+
}
29863015
/* round up to 32-bytes, since this is granularity
29873016
* of interpreter stack size
29883017
*/

0 commit comments

Comments
 (0)