Commit 2b5a2ecb authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Alexei Starovoitov
Browse files

bpf: Initialize the bpf_run_ctx in bpf_iter_run_prog() 



The bpf-iter-prog for tcp and unix sk can do bpf_setsockopt()
which needs has_current_bpf_ctx() to decide if it is called by a
bpf prog.  This patch initializes the bpf_run_ctx in
bpf_iter_run_prog() for the has_current_bpf_ctx() to use.

Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Reviewed-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/r/20220817061751.4177657-1-kafai@fb.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 40cd308e

kernel/bpf/bpf_iter.c

+5 −0
Original line number Diff line number Diff line
@@ -694,19 +694,24 @@ struct bpf_prog *bpf_iter_get_info(struct bpf_iter_meta *meta, bool in_stop) 


int bpf_iter_run_prog(struct bpf_prog *prog, void *ctx)

{

	struct bpf_run_ctx run_ctx, *old_run_ctx;

	int ret;



	if (prog->aux->sleepable) {

		rcu_read_lock_trace();

		migrate_disable();

		might_fault();

		old_run_ctx = bpf_set_run_ctx(&run_ctx);

		ret = bpf_prog_run(prog, ctx);

		bpf_reset_run_ctx(old_run_ctx);

		migrate_enable();

		rcu_read_unlock_trace();

	} else {

		rcu_read_lock();

		migrate_disable();

		old_run_ctx = bpf_set_run_ctx(&run_ctx);

		ret = bpf_prog_run(prog, ctx);

		bpf_reset_run_ctx(old_run_ctx);

		migrate_enable();

		rcu_read_unlock();

	}