Linux patch 6.6.386.6-45

Signed-off-by: Mike Pagano <mpagano@gentoo.org>

2 files changed, 632 insertions, 0 deletions

diff --git a/0000_README b/0000_README
index 7c6b39c1..601f23d2 100644
--- a/0000_README
+++ b/0000_README
@@ -191,6 +191,10 @@ Patch:  1036_linux-6.6.37.patch
 From:   https://www.kernel.org
 Desc:   Linux 6.6.37
 
+Patch:  1037_linux-6.6.38.patch
+From:   https://www.kernel.org
+Desc:   Linux 6.6.38
+
 Patch:  1510_fs-enable-link-security-restrictions-by-default.patch
 From:   http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch
 Desc:   Enable link security restrictions by default.
diff --git a/1037_linux-6.6.38.patch b/1037_linux-6.6.38.patch
new file mode 100644
index 00000000..cfdc3927
--- /dev/null
+++ b/1037_linux-6.6.38.patch
@@ -0,0 +1,628 @@
+diff --git a/Makefile b/Makefile
+index 8a73b886156a0..badff33682184 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 6
+ PATCHLEVEL = 6
+-SUBLEVEL = 37
++SUBLEVEL = 38
+ EXTRAVERSION =
+ NAME = Hurr durr I'ma ninja sloth
+ 
+diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
+index ac8e4d9bf9544..6a1c9fca5260b 100644
+--- a/arch/arm/net/bpf_jit_32.c
++++ b/arch/arm/net/bpf_jit_32.c
+@@ -1982,21 +1982,28 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
+ 	/* If building the body of the JITed code fails somehow,
+ 	 * we fall back to the interpretation.
+ 	 */
+-	if (build_body(&ctx) < 0)
+-		goto out_free;
++	if (build_body(&ctx) < 0) {
++		image_ptr = NULL;
++		bpf_jit_binary_free(header);
++		prog = orig_prog;
++		goto out_imms;
++	}
+ 	build_epilogue(&ctx);
+ 
+ 	/* 3.) Extra pass to validate JITed Code */
+-	if (validate_code(&ctx))
+-		goto out_free;
++	if (validate_code(&ctx)) {
++		image_ptr = NULL;
++		bpf_jit_binary_free(header);
++		prog = orig_prog;
++		goto out_imms;
++	}
+ 	flush_icache_range((u32)header, (u32)(ctx.target + ctx.idx));
+ 
+ 	if (bpf_jit_enable > 1)
+ 		/* there are 2 passes here */
+ 		bpf_jit_dump(prog->len, image_size, 2, ctx.target);
+ 
+-	if (bpf_jit_binary_lock_ro(header))
+-		goto out_free;
++	bpf_jit_binary_lock_ro(header);
+ 	prog->bpf_func = (void *)ctx.target;
+ 	prog->jited = 1;
+ 	prog->jited_len = image_size;
+@@ -2013,11 +2020,5 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
+ 		bpf_jit_prog_release_other(prog, prog == orig_prog ?
+ 					   tmp : orig_prog);
+ 	return prog;
+-
+-out_free:
+-	image_ptr = NULL;
+-	bpf_jit_binary_free(header);
+-	prog = orig_prog;
+-	goto out_imms;
+ }
+ 
+diff --git a/arch/loongarch/net/bpf_jit.c b/arch/loongarch/net/bpf_jit.c
+index 13cd480385ca8..9eb7753d117df 100644
+--- a/arch/loongarch/net/bpf_jit.c
++++ b/arch/loongarch/net/bpf_jit.c
+@@ -1206,19 +1206,16 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
+ 	flush_icache_range((unsigned long)header, (unsigned long)(ctx.image + ctx.idx));
+ 
+ 	if (!prog->is_func || extra_pass) {
+-		int err;
+-
+ 		if (extra_pass && ctx.idx != jit_data->ctx.idx) {
+ 			pr_err_once("multi-func JIT bug %d != %d\n",
+ 				    ctx.idx, jit_data->ctx.idx);
+-			goto out_free;
+-		}
+-		err = bpf_jit_binary_lock_ro(header);
+-		if (err) {
+-			pr_err_once("bpf_jit_binary_lock_ro() returned %d\n",
+-				    err);
+-			goto out_free;
++			bpf_jit_binary_free(header);
++			prog->bpf_func = NULL;
++			prog->jited = 0;
++			prog->jited_len = 0;
++			goto out_offset;
+ 		}
++		bpf_jit_binary_lock_ro(header);
+ 	} else {
+ 		jit_data->ctx = ctx;
+ 		jit_data->image = image_ptr;
+@@ -1249,13 +1246,6 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
+ 	out_offset = -1;
+ 
+ 	return prog;
+-
+-out_free:
+-	bpf_jit_binary_free(header);
+-	prog->bpf_func = NULL;
+-	prog->jited = 0;
+-	prog->jited_len = 0;
+-	goto out_offset;
+ }
+ 
+ /* Indicate the JIT backend supports mixing bpf2bpf and tailcalls. */
+diff --git a/arch/mips/net/bpf_jit_comp.c b/arch/mips/net/bpf_jit_comp.c
+index e355dfca44008..a40d926b65139 100644
+--- a/arch/mips/net/bpf_jit_comp.c
++++ b/arch/mips/net/bpf_jit_comp.c
+@@ -1012,8 +1012,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
+ 	bpf_prog_fill_jited_linfo(prog, &ctx.descriptors[1]);
+ 
+ 	/* Set as read-only exec and flush instruction cache */
+-	if (bpf_jit_binary_lock_ro(header))
+-		goto out_err;
++	bpf_jit_binary_lock_ro(header);
+ 	flush_icache_range((unsigned long)header,
+ 			   (unsigned long)&ctx.target[ctx.jit_index]);
+ 
+diff --git a/arch/parisc/net/bpf_jit_core.c b/arch/parisc/net/bpf_jit_core.c
+index 979f45d4d1fbe..d6ee2fd455503 100644
+--- a/arch/parisc/net/bpf_jit_core.c
++++ b/arch/parisc/net/bpf_jit_core.c
+@@ -167,13 +167,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
+ 	bpf_flush_icache(jit_data->header, ctx->insns + ctx->ninsns);
+ 
+ 	if (!prog->is_func || extra_pass) {
+-		if (bpf_jit_binary_lock_ro(jit_data->header)) {
+-			bpf_jit_binary_free(jit_data->header);
+-			prog->bpf_func = NULL;
+-			prog->jited = 0;
+-			prog->jited_len = 0;
+-			goto out_offset;
+-		}
++		bpf_jit_binary_lock_ro(jit_data->header);
+ 		prologue_len = ctx->epilogue_offset - ctx->body_len;
+ 		for (i = 0; i < prog->len; i++)
+ 			ctx->offset[i] += prologue_len;
+diff --git a/arch/powerpc/net/bpf_jit.h b/arch/powerpc/net/bpf_jit.h
+index cdea5dccaefe7..72b7bb34fadea 100644
+--- a/arch/powerpc/net/bpf_jit.h
++++ b/arch/powerpc/net/bpf_jit.h
+@@ -36,6 +36,9 @@
+ 		EMIT(PPC_RAW_BRANCH(offset));				      \
+ 	} while (0)
+ 
++/* bl (unconditional 'branch' with link) */
++#define PPC_BL(dest)	EMIT(PPC_RAW_BL((dest) - (unsigned long)(image + ctx->idx)))
++
+ /* "cond" here covers BO:BI fields. */
+ #define PPC_BCC_SHORT(cond, dest)					      \
+ 	do {								      \
+@@ -144,6 +147,12 @@ struct codegen_context {
+ #define BPF_FIXUP_LEN	2 /* Two instructions => 8 bytes */
+ #endif
+ 
++static inline void bpf_flush_icache(void *start, void *end)
++{
++	smp_wmb();	/* smp write barrier */
++	flush_icache_range((unsigned long)start, (unsigned long)end);
++}
++
+ static inline bool bpf_is_seen_register(struct codegen_context *ctx, int i)
+ {
+ 	return ctx->seen & (1 << (31 - i));
+@@ -160,17 +169,16 @@ static inline void bpf_clear_seen_register(struct codegen_context *ctx, int i)
+ }
+ 
+ void bpf_jit_init_reg_mapping(struct codegen_context *ctx);
+-int bpf_jit_emit_func_call_rel(u32 *image, u32 *fimage, struct codegen_context *ctx, u64 func);
+-int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, u32 *fimage, struct codegen_context *ctx,
++int bpf_jit_emit_func_call_rel(u32 *image, struct codegen_context *ctx, u64 func);
++int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context *ctx,
+ 		       u32 *addrs, int pass, bool extra_pass);
+ void bpf_jit_build_prologue(u32 *image, struct codegen_context *ctx);
+ void bpf_jit_build_epilogue(u32 *image, struct codegen_context *ctx);
+ void bpf_jit_realloc_regs(struct codegen_context *ctx);
+ int bpf_jit_emit_exit_insn(u32 *image, struct codegen_context *ctx, int tmp_reg, long exit_addr);
+ 
+-int bpf_add_extable_entry(struct bpf_prog *fp, u32 *image, u32 *fimage, int pass,
+-			  struct codegen_context *ctx, int insn_idx,
+-			  int jmp_off, int dst_reg);
++int bpf_add_extable_entry(struct bpf_prog *fp, u32 *image, int pass, struct codegen_context *ctx,
++			  int insn_idx, int jmp_off, int dst_reg);
+ 
+ #endif
+ 
+diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
+index cee6a57b9d088..37043dfc1addd 100644
+--- a/arch/powerpc/net/bpf_jit_comp.c
++++ b/arch/powerpc/net/bpf_jit_comp.c
+@@ -39,13 +39,10 @@ int bpf_jit_emit_exit_insn(u32 *image, struct codegen_context *ctx, int tmp_reg,
+ 	return 0;
+ }
+ 
+-struct powerpc_jit_data {
+-	/* address of rw header */
+-	struct bpf_binary_header *hdr;
+-	/* address of ro final header */
+-	struct bpf_binary_header *fhdr;
++struct powerpc64_jit_data {
++	struct bpf_binary_header *header;
+ 	u32 *addrs;
+-	u8 *fimage;
++	u8 *image;
+ 	u32 proglen;
+ 	struct codegen_context ctx;
+ };
+@@ -62,18 +59,15 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
+ 	u8 *image = NULL;
+ 	u32 *code_base;
+ 	u32 *addrs;
+-	struct powerpc_jit_data *jit_data;
++	struct powerpc64_jit_data *jit_data;
+ 	struct codegen_context cgctx;
+ 	int pass;
+ 	int flen;
+-	struct bpf_binary_header *fhdr = NULL;
+-	struct bpf_binary_header *hdr = NULL;
++	struct bpf_binary_header *bpf_hdr;
+ 	struct bpf_prog *org_fp = fp;
+ 	struct bpf_prog *tmp_fp;
+ 	bool bpf_blinded = false;
+ 	bool extra_pass = false;
+-	u8 *fimage = NULL;
+-	u32 *fcode_base;
+ 	u32 extable_len;
+ 	u32 fixup_len;
+ 
+@@ -103,16 +97,9 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
+ 	addrs = jit_data->addrs;
+ 	if (addrs) {
+ 		cgctx = jit_data->ctx;
+-		/*
+-		 * JIT compiled to a writable location (image/code_base) first.
+-		 * It is then moved to the readonly final location (fimage/fcode_base)
+-		 * using instruction patching.
+-		 */
+-		fimage = jit_data->fimage;
+-		fhdr = jit_data->fhdr;
++		image = jit_data->image;
++		bpf_hdr = jit_data->header;
+ 		proglen = jit_data->proglen;
+-		hdr = jit_data->hdr;
+-		image = (void *)hdr + ((void *)fimage - (void *)fhdr);
+ 		extra_pass = true;
+ 		/* During extra pass, ensure index is reset before repopulating extable entries */
+ 		cgctx.exentry_idx = 0;
+@@ -132,7 +119,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
+ 	cgctx.stack_size = round_up(fp->aux->stack_depth, 16);
+ 
+ 	/* Scouting faux-generate pass 0 */
+-	if (bpf_jit_build_body(fp, NULL, NULL, &cgctx, addrs, 0, false)) {
++	if (bpf_jit_build_body(fp, 0, &cgctx, addrs, 0, false)) {
+ 		/* We hit something illegal or unsupported. */
+ 		fp = org_fp;
+ 		goto out_addrs;
+@@ -147,7 +134,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
+ 	 */
+ 	if (cgctx.seen & SEEN_TAILCALL || !is_offset_in_branch_range((long)cgctx.idx * 4)) {
+ 		cgctx.idx = 0;
+-		if (bpf_jit_build_body(fp, NULL, NULL, &cgctx, addrs, 0, false)) {
++		if (bpf_jit_build_body(fp, 0, &cgctx, addrs, 0, false)) {
+ 			fp = org_fp;
+ 			goto out_addrs;
+ 		}
+@@ -169,19 +156,17 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
+ 	proglen = cgctx.idx * 4;
+ 	alloclen = proglen + FUNCTION_DESCR_SIZE + fixup_len + extable_len;
+ 
+-	fhdr = bpf_jit_binary_pack_alloc(alloclen, &fimage, 4, &hdr, &image,
+-					      bpf_jit_fill_ill_insns);
+-	if (!fhdr) {
++	bpf_hdr = bpf_jit_binary_alloc(alloclen, &image, 4, bpf_jit_fill_ill_insns);
++	if (!bpf_hdr) {
+ 		fp = org_fp;
+ 		goto out_addrs;
+ 	}
+ 
+ 	if (extable_len)
+-		fp->aux->extable = (void *)fimage + FUNCTION_DESCR_SIZE + proglen + fixup_len;
++		fp->aux->extable = (void *)image + FUNCTION_DESCR_SIZE + proglen + fixup_len;
+ 
+ skip_init_ctx:
+ 	code_base = (u32 *)(image + FUNCTION_DESCR_SIZE);
+-	fcode_base = (u32 *)(fimage + FUNCTION_DESCR_SIZE);
+ 
+ 	/* Code generation passes 1-2 */
+ 	for (pass = 1; pass < 3; pass++) {
+@@ -189,10 +174,8 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
+ 		cgctx.idx = 0;
+ 		cgctx.alt_exit_addr = 0;
+ 		bpf_jit_build_prologue(code_base, &cgctx);
+-		if (bpf_jit_build_body(fp, code_base, fcode_base, &cgctx, addrs, pass,
+-				       extra_pass)) {
+-			bpf_arch_text_copy(&fhdr->size, &hdr->size, sizeof(hdr->size));
+-			bpf_jit_binary_pack_free(fhdr, hdr);
++		if (bpf_jit_build_body(fp, code_base, &cgctx, addrs, pass, extra_pass)) {
++			bpf_jit_binary_free(bpf_hdr);
+ 			fp = org_fp;
+ 			goto out_addrs;
+ 		}
+@@ -212,19 +195,17 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
+ 
+ #ifdef CONFIG_PPC64_ELF_ABI_V1
+ 	/* Function descriptor nastiness: Address + TOC */
+-	((u64 *)image)[0] = (u64)fcode_base;
++	((u64 *)image)[0] = (u64)code_base;
+ 	((u64 *)image)[1] = local_paca->kernel_toc;
+ #endif
+ 
+-	fp->bpf_func = (void *)fimage;
++	fp->bpf_func = (void *)image;
+ 	fp->jited = 1;
+ 	fp->jited_len = proglen + FUNCTION_DESCR_SIZE;
+ 
++	bpf_flush_icache(bpf_hdr, (u8 *)bpf_hdr + bpf_hdr->size);
+ 	if (!fp->is_func || extra_pass) {
+-		if (bpf_jit_binary_pack_finalize(fp, fhdr, hdr)) {
+-			fp = org_fp;
+-			goto out_addrs;
+-		}
++		bpf_jit_binary_lock_ro(bpf_hdr);
+ 		bpf_prog_fill_jited_linfo(fp, addrs);
+ out_addrs:
+ 		kfree(addrs);
+@@ -234,9 +215,8 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
+ 		jit_data->addrs = addrs;
+ 		jit_data->ctx = cgctx;
+ 		jit_data->proglen = proglen;
+-		jit_data->fimage = fimage;
+-		jit_data->fhdr = fhdr;
+-		jit_data->hdr = hdr;
++		jit_data->image = image;
++		jit_data->header = bpf_hdr;
+ 	}
+ 
+ out:
+@@ -250,13 +230,12 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
+  * The caller should check for (BPF_MODE(code) == BPF_PROBE_MEM) before calling
+  * this function, as this only applies to BPF_PROBE_MEM, for now.
+  */
+-int bpf_add_extable_entry(struct bpf_prog *fp, u32 *image, u32 *fimage, int pass,
+-			  struct codegen_context *ctx, int insn_idx, int jmp_off,
+-			  int dst_reg)
++int bpf_add_extable_entry(struct bpf_prog *fp, u32 *image, int pass, struct codegen_context *ctx,
++			  int insn_idx, int jmp_off, int dst_reg)
+ {
+ 	off_t offset;
+ 	unsigned long pc;
+-	struct exception_table_entry *ex, *ex_entry;
++	struct exception_table_entry *ex;
+ 	u32 *fixup;
+ 
+ 	/* Populate extable entries only in the last pass */
+@@ -267,16 +246,9 @@ int bpf_add_extable_entry(struct bpf_prog *fp, u32 *image, u32 *fimage, int pass
+ 	    WARN_ON_ONCE(ctx->exentry_idx >= fp->aux->num_exentries))
+ 		return -EINVAL;
+ 
+-	/*
+-	 * Program is first written to image before copying to the
+-	 * final location (fimage). Accordingly, update in the image first.
+-	 * As all offsets used are relative, copying as is to the
+-	 * final location should be alright.
+-	 */
+ 	pc = (unsigned long)&image[insn_idx];
+-	ex = (void *)fp->aux->extable - (void *)fimage + (void *)image;
+ 
+-	fixup = (void *)ex -
++	fixup = (void *)fp->aux->extable -
+ 		(fp->aux->num_exentries * BPF_FIXUP_LEN * 4) +
+ 		(ctx->exentry_idx * BPF_FIXUP_LEN * 4);
+ 
+@@ -287,42 +259,18 @@ int bpf_add_extable_entry(struct bpf_prog *fp, u32 *image, u32 *fimage, int pass
+ 	fixup[BPF_FIXUP_LEN - 1] =
+ 		PPC_RAW_BRANCH((long)(pc + jmp_off) - (long)&fixup[BPF_FIXUP_LEN - 1]);
+ 
+-	ex_entry = &ex[ctx->exentry_idx];
++	ex = &fp->aux->extable[ctx->exentry_idx];
+ 
+-	offset = pc - (long)&ex_entry->insn;
++	offset = pc - (long)&ex->insn;
+ 	if (WARN_ON_ONCE(offset >= 0 || offset < INT_MIN))
+ 		return -ERANGE;
+-	ex_entry->insn = offset;
++	ex->insn = offset;
+ 
+-	offset = (long)fixup - (long)&ex_entry->fixup;
++	offset = (long)fixup - (long)&ex->fixup;
+ 	if (WARN_ON_ONCE(offset >= 0 || offset < INT_MIN))
+ 		return -ERANGE;
+-	ex_entry->fixup = offset;
++	ex->fixup = offset;
+ 
+ 	ctx->exentry_idx++;
+ 	return 0;
+ }
+-
+-void bpf_jit_free(struct bpf_prog *fp)
+-{
+-	if (fp->jited) {
+-		struct powerpc_jit_data *jit_data = fp->aux->jit_data;
+-		struct bpf_binary_header *hdr;
+-
+-		/*
+-		 * If we fail the final pass of JIT (from jit_subprogs),
+-		 * the program may not be finalized yet. Call finalize here
+-		 * before freeing it.
+-		 */
+-		if (jit_data) {
+-			bpf_jit_binary_pack_finalize(fp, jit_data->fhdr, jit_data->hdr);
+-			kvfree(jit_data->addrs);
+-			kfree(jit_data);
+-		}
+-		hdr = bpf_jit_binary_pack_hdr(fp);
+-		bpf_jit_binary_pack_free(hdr, NULL);
+-		WARN_ON_ONCE(!bpf_prog_kallsyms_verify_off(fp));
+-	}
+-
+-	bpf_prog_unlock_free(fp);
+-}
+diff --git a/arch/powerpc/net/bpf_jit_comp32.c b/arch/powerpc/net/bpf_jit_comp32.c
+index dd61aa4325d93..06f886850a932 100644
+--- a/arch/powerpc/net/bpf_jit_comp32.c
++++ b/arch/powerpc/net/bpf_jit_comp32.c
+@@ -200,13 +200,12 @@ void bpf_jit_build_epilogue(u32 *image, struct codegen_context *ctx)
+ 	EMIT(PPC_RAW_BLR());
+ }
+ 
+-/* Relative offset needs to be calculated based on final image location */
+-int bpf_jit_emit_func_call_rel(u32 *image, u32 *fimage, struct codegen_context *ctx, u64 func)
++int bpf_jit_emit_func_call_rel(u32 *image, struct codegen_context *ctx, u64 func)
+ {
+-	s32 rel = (s32)func - (s32)(fimage + ctx->idx);
++	s32 rel = (s32)func - (s32)(image + ctx->idx);
+ 
+ 	if (image && rel < 0x2000000 && rel >= -0x2000000) {
+-		EMIT(PPC_RAW_BL(rel));
++		PPC_BL(func);
+ 	} else {
+ 		/* Load function address into r0 */
+ 		EMIT(PPC_RAW_LIS(_R0, IMM_H(func)));
+@@ -279,7 +278,7 @@ static int bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32 o
+ }
+ 
+ /* Assemble the body code between the prologue & epilogue */
+-int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, u32 *fimage, struct codegen_context *ctx,
++int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context *ctx,
+ 		       u32 *addrs, int pass, bool extra_pass)
+ {
+ 	const struct bpf_insn *insn = fp->insnsi;
+@@ -1010,7 +1009,7 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, u32 *fimage, struct code
+ 					jmp_off += 4;
+ 				}
+ 
+-				ret = bpf_add_extable_entry(fp, image, fimage, pass, ctx, insn_idx,
++				ret = bpf_add_extable_entry(fp, image, pass, ctx, insn_idx,
+ 							    jmp_off, dst_reg);
+ 				if (ret)
+ 					return ret;
+@@ -1066,7 +1065,7 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, u32 *fimage, struct code
+ 				EMIT(PPC_RAW_STW(bpf_to_ppc(BPF_REG_5), _R1, 12));
+ 			}
+ 
+-			ret = bpf_jit_emit_func_call_rel(image, fimage, ctx, func_addr);
++			ret = bpf_jit_emit_func_call_rel(image, ctx, func_addr);
+ 			if (ret)
+ 				return ret;
+ 
+diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c
+index 884eef1b3973b..2239ce5e8501c 100644
+--- a/arch/powerpc/net/bpf_jit_comp64.c
++++ b/arch/powerpc/net/bpf_jit_comp64.c
+@@ -240,7 +240,7 @@ static int bpf_jit_emit_func_call_hlp(u32 *image, struct codegen_context *ctx, u
+ 	return 0;
+ }
+ 
+-int bpf_jit_emit_func_call_rel(u32 *image, u32 *fimage, struct codegen_context *ctx, u64 func)
++int bpf_jit_emit_func_call_rel(u32 *image, struct codegen_context *ctx, u64 func)
+ {
+ 	unsigned int i, ctx_idx = ctx->idx;
+ 
+@@ -361,7 +361,7 @@ asm (
+ );
+ 
+ /* Assemble the body code between the prologue & epilogue */
+-int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, u32 *fimage, struct codegen_context *ctx,
++int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context *ctx,
+ 		       u32 *addrs, int pass, bool extra_pass)
+ {
+ 	enum stf_barrier_type stf_barrier = stf_barrier_type_get();
+@@ -952,8 +952,8 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, u32 *fimage, struct code
+ 				addrs[++i] = ctx->idx * 4;
+ 
+ 			if (BPF_MODE(code) == BPF_PROBE_MEM) {
+-				ret = bpf_add_extable_entry(fp, image, fimage, pass, ctx,
+-							    ctx->idx - 1, 4, dst_reg);
++				ret = bpf_add_extable_entry(fp, image, pass, ctx, ctx->idx - 1,
++							    4, dst_reg);
+ 				if (ret)
+ 					return ret;
+ 			}
+@@ -1007,7 +1007,7 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, u32 *fimage, struct code
+ 			if (func_addr_fixed)
+ 				ret = bpf_jit_emit_func_call_hlp(image, ctx, func_addr);
+ 			else
+-				ret = bpf_jit_emit_func_call_rel(image, fimage, ctx, func_addr);
++				ret = bpf_jit_emit_func_call_rel(image, ctx, func_addr);
+ 
+ 			if (ret)
+ 				return ret;
+diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
+index 05746e22fe79c..62ee557d4b499 100644
+--- a/arch/s390/net/bpf_jit_comp.c
++++ b/arch/s390/net/bpf_jit_comp.c
+@@ -1973,11 +1973,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
+ 		print_fn_code(jit.prg_buf, jit.size_prg);
+ 	}
+ 	if (!fp->is_func || extra_pass) {
+-		if (bpf_jit_binary_lock_ro(header)) {
+-			bpf_jit_binary_free(header);
+-			fp = orig_fp;
+-			goto free_addrs;
+-		}
++		bpf_jit_binary_lock_ro(header);
+ 	} else {
+ 		jit_data->header = header;
+ 		jit_data->ctx = jit;
+diff --git a/arch/sparc/net/bpf_jit_comp_64.c b/arch/sparc/net/bpf_jit_comp_64.c
+index 73bf0aea8baf1..fa0759bfe498e 100644
+--- a/arch/sparc/net/bpf_jit_comp_64.c
++++ b/arch/sparc/net/bpf_jit_comp_64.c
+@@ -1602,11 +1602,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
+ 	bpf_flush_icache(header, (u8 *)header + header->size);
+ 
+ 	if (!prog->is_func || extra_pass) {
+-		if (bpf_jit_binary_lock_ro(header)) {
+-			bpf_jit_binary_free(header);
+-			prog = orig_prog;
+-			goto out_off;
+-		}
++		bpf_jit_binary_lock_ro(header);
+ 	} else {
+ 		jit_data->ctx = ctx;
+ 		jit_data->image = image_ptr;
+diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c
+index f2fc8c38629b5..429a89c5468b5 100644
+--- a/arch/x86/net/bpf_jit_comp32.c
++++ b/arch/x86/net/bpf_jit_comp32.c
+@@ -2600,7 +2600,8 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
+ 	if (bpf_jit_enable > 1)
+ 		bpf_jit_dump(prog->len, proglen, pass + 1, image);
+ 
+-	if (image && !bpf_jit_binary_lock_ro(header)) {
++	if (image) {
++		bpf_jit_binary_lock_ro(header);
+ 		prog->bpf_func = (void *)image;
+ 		prog->jited = 1;
+ 		prog->jited_len = proglen;
+diff --git a/include/linux/filter.h b/include/linux/filter.h
+index a74d97114a542..5090e940ba3e4 100644
+--- a/include/linux/filter.h
++++ b/include/linux/filter.h
+@@ -842,22 +842,20 @@ 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 int __must_check bpf_prog_lock_ro(struct bpf_prog *fp)
++static inline void bpf_prog_lock_ro(struct bpf_prog *fp)
+ {
+ #ifndef CONFIG_BPF_JIT_ALWAYS_ON
+ 	if (!fp->jited) {
+ 		set_vm_flush_reset_perms(fp);
+-		return set_memory_ro((unsigned long)fp, fp->pages);
++		set_memory_ro((unsigned long)fp, fp->pages);
+ 	}
+ #endif
+-	return 0;
+ }
+ 
+-static inline int __must_check
+-bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr)
++static inline void bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr)
+ {
+ 	set_vm_flush_reset_perms(hdr);
+-	return set_memory_rox((unsigned long)hdr, hdr->size >> PAGE_SHIFT);
++	set_memory_rox((unsigned long)hdr, hdr->size >> PAGE_SHIFT);
+ }
+ 
+ int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap);
+diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
+index 77a9b12e00af7..4124805ad7ba5 100644
+--- a/kernel/bpf/core.c
++++ b/kernel/bpf/core.c
+@@ -2375,9 +2375,7 @@ struct bpf_prog *bpf_prog_select_runtime(struct bpf_prog *fp, int *err)
+ 	}
+ 
+ finalize:
+-	*err = bpf_prog_lock_ro(fp);
+-	if (*err)
+-		return fp;
++	bpf_prog_lock_ro(fp);
+ 
+ 	/* The tail call compatibility check can only be done at
+ 	 * this late stage as we need to determine, if we deal
+diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
+index aa546355918cb..171045b6956d9 100644
+--- a/kernel/bpf/verifier.c
++++ b/kernel/bpf/verifier.c
+@@ -18625,13 +18625,9 @@ 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++) {
+-		err = bpf_prog_lock_ro(func[i]);
+-		if (err)
+-			goto out_free;
+-	}
+-
+-	for (i = 1; i < env->subprog_cnt; i++)
++		bpf_prog_lock_ro(func[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