Unverified Commit 3cdb76a5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10545 bpf: Take return from set_memory_ro() into account with bpf_prog_lock_ro() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tengda Wu <wutengda2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NQBJYNE7SSJKGOFI5YRE3KG6IPIBRLZ6/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEOM 
 
Link:https://gitee.com/openeuler/kernel/pulls/10545

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 02f627bd 019b355b

include/linux/filter.h

+3 −2
Original line number Diff line number Diff line
@@ -842,14 +842,15 @@ bpf_ctx_narrow_access_offset(u32 off, u32 size, u32 size_default) 


#define bpf_classic_proglen(fprog) (fprog->len * sizeof(fprog->filter[0]))



static inline void bpf_prog_lock_ro(struct bpf_prog *fp)

static inline int __must_check bpf_prog_lock_ro(struct bpf_prog *fp)

{

#ifndef CONFIG_BPF_JIT_ALWAYS_ON

	if (!fp->jited) {

		set_vm_flush_reset_perms(fp);

		set_memory_ro((unsigned long)fp, fp->pages);

		return set_memory_ro((unsigned long)fp, fp->pages);

	}

#endif

	return 0;

}



static inline void bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr)

kernel/bpf/core.c

+3 −1
Original line number Diff line number Diff line
@@ -2375,7 +2375,9 @@ struct bpf_prog *bpf_prog_select_runtime(struct bpf_prog *fp, int *err) 
	}



finalize:

	bpf_prog_lock_ro(fp);

	*err = bpf_prog_lock_ro(fp);

	if (*err)

		return fp;



	/* The tail call compatibility check can only be done at

	 * this late stage as we need to determine, if we deal

kernel/bpf/verifier.c

+6 −2
Original line number Diff line number Diff line
@@ -18627,10 +18627,14 @@ static int jit_subprogs(struct bpf_verifier_env *env) 
	 * bpf_prog_load will add the kallsyms for the main program.

	 */

	for (i = 1; i < env->subprog_cnt; i++) {

		bpf_prog_lock_ro(func[i]);

		bpf_prog_kallsyms_add(func[i]);

		err = bpf_prog_lock_ro(func[i]);

		if (err)

			goto out_free;

	}









	for (i = 1; i < env->subprog_cnt; i++)









		bpf_prog_kallsyms_add(func[i]);

















	/* Last step: make now unused interpreter insns from main









	 * prog consistent for later dump requests, so they can









	 * later look the same as if they were interpreted only.