Skip to content

Commit 7dc211c

Browse files
Pu LehuiAlexei Starovoitov
authored andcommitted
bpf: Fix invalid prog->stats access when update_effective_progs fails
Syzkaller triggers an invalid memory access issue following fault injection in update_effective_progs. The issue can be described as follows: __cgroup_bpf_detach update_effective_progs compute_effective_progs bpf_prog_array_alloc <-- fault inject purge_effective_progs /* change to dummy_bpf_prog */ array->items[index] = &dummy_bpf_prog.prog ---softirq start--- __do_softirq ... __cgroup_bpf_run_filter_skb __bpf_prog_run_save_cb bpf_prog_run stats = this_cpu_ptr(prog->stats) /* invalid memory access */ flags = u64_stats_update_begin_irqsave(&stats->syncp) ---softirq end--- static_branch_dec(&cgroup_bpf_enabled_key[atype]) The reason is that fault injection caused update_effective_progs to fail and then changed the original prog into dummy_bpf_prog.prog in purge_effective_progs. Then a softirq came, and accessing the members of dummy_bpf_prog.prog in the softirq triggers invalid mem access. To fix it, skip updating stats when stats is NULL. Fixes: 492ecee ("bpf: enable program stats") Signed-off-by: Pu Lehui <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 4722981 commit 7dc211c

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

include/linux/filter.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -712,11 +712,13 @@ static __always_inline u32 __bpf_prog_run(const struct bpf_prog *prog,
712712
ret = dfunc(ctx, prog->insnsi, prog->bpf_func);
713713

714714
duration = sched_clock() - start;
715-
stats = this_cpu_ptr(prog->stats);
716-
flags = u64_stats_update_begin_irqsave(&stats->syncp);
717-
u64_stats_inc(&stats->cnt);
718-
u64_stats_add(&stats->nsecs, duration);
719-
u64_stats_update_end_irqrestore(&stats->syncp, flags);
715+
if (likely(prog->stats)) {
716+
stats = this_cpu_ptr(prog->stats);
717+
flags = u64_stats_update_begin_irqsave(&stats->syncp);
718+
u64_stats_inc(&stats->cnt);
719+
u64_stats_add(&stats->nsecs, duration);
720+
u64_stats_update_end_irqrestore(&stats->syncp, flags);
721+
}
720722
} else {
721723
ret = dfunc(ctx, prog->insnsi, prog->bpf_func);
722724
}

kernel/bpf/syscall.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2463,6 +2463,9 @@ void notrace bpf_prog_inc_misses_counter(struct bpf_prog *prog)
24632463
struct bpf_prog_stats *stats;
24642464
unsigned int flags;
24652465

2466+
if (unlikely(!prog->stats))
2467+
return;
2468+
24662469
stats = this_cpu_ptr(prog->stats);
24672470
flags = u64_stats_update_begin_irqsave(&stats->syncp);
24682471
u64_stats_inc(&stats->misses);

0 commit comments

Comments
 (0)