kernel-6.14.7-200

* Sun May 18 2025 Justin M. Forbes <jforbes@fedoraproject.org> [6.14.7-0] - Turn on MITIGATION_ITS for RHEL configs (Justin M. Forbes) - Add bug to Bugsfixed for 6.14.7 (Justin M. Forbes) - powerpc/bpf: fix JIT code size calculation of bpf trampoline (Hari Bathini) - Set MITIGATION_ITS for Fedora (Justin M. Forbes) - Fedora 40 is EOL (Justin M. Forbes) - Linux v6.14.7 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2025-05-18 09:47:04 -06:00 · 2025-05-18 09:47:04 -06:00 · be7d7fde5b
commit be7d7fde5b
parent a888a0d88f
15 changed files with 226 additions and 9 deletions
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/6f21234ca80186c3ac2dba318fa458f967c6f677
+ 6f21234ca80186c3ac2dba318fa458f967c6f677 powerpc/bpf: fix JIT code size calculation of bpf trampoline
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/548348714f4f09cd0d35bc88d748c6c148f34e71
 548348714f4f09cd0d35bc88d748c6c148f34e71 platform/x86/intel/pmc: Add Arrow Lake U/H support to intel_pmc_core driver

--- a/kernel-x86_64-automotive-debug-rhel.config
+++ b/kernel-x86_64-automotive-debug-rhel.config
@ -3875,6 +3875,7 @@ CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y
 CONFIG_MITIGATION_GDS=y
 CONFIG_MITIGATION_IBPB_ENTRY=y
 CONFIG_MITIGATION_IBRS_ENTRY=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_L1TF=y
 CONFIG_MITIGATION_MDS=y
 CONFIG_MITIGATION_MMIO_STALE_DATA=y
--- a/kernel-x86_64-automotive-rhel.config
+++ b/kernel-x86_64-automotive-rhel.config
@ -3855,6 +3855,7 @@ CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y
 CONFIG_MITIGATION_GDS=y
 CONFIG_MITIGATION_IBPB_ENTRY=y
 CONFIG_MITIGATION_IBRS_ENTRY=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_L1TF=y
 CONFIG_MITIGATION_MDS=y
 CONFIG_MITIGATION_MMIO_STALE_DATA=y
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@ -4266,6 +4266,7 @@ CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y
 CONFIG_MITIGATION_GDS=y
 CONFIG_MITIGATION_IBPB_ENTRY=y
 CONFIG_MITIGATION_IBRS_ENTRY=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_L1TF=y
 CONFIG_MITIGATION_MDS=y
 CONFIG_MITIGATION_MMIO_STALE_DATA=y
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@ -3758,6 +3758,7 @@ CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y
 CONFIG_MITIGATION_GDS=y
 CONFIG_MITIGATION_IBPB_ENTRY=y
 CONFIG_MITIGATION_IBRS_ENTRY=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_L1TF=y
 CONFIG_MITIGATION_MDS=y
 CONFIG_MITIGATION_MMIO_STALE_DATA=y
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@ -4240,6 +4240,7 @@ CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y
 CONFIG_MITIGATION_GDS=y
 CONFIG_MITIGATION_IBPB_ENTRY=y
 CONFIG_MITIGATION_IBRS_ENTRY=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_L1TF=y
 CONFIG_MITIGATION_MDS=y
 CONFIG_MITIGATION_MMIO_STALE_DATA=y
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@ -3738,6 +3738,7 @@ CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y
 CONFIG_MITIGATION_GDS=y
 CONFIG_MITIGATION_IBPB_ENTRY=y
 CONFIG_MITIGATION_IBRS_ENTRY=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_L1TF=y
 CONFIG_MITIGATION_MDS=y
 CONFIG_MITIGATION_MMIO_STALE_DATA=y
--- a/kernel-x86_64-rt-debug-fedora.config
+++ b/kernel-x86_64-rt-debug-fedora.config
@ -4271,6 +4271,7 @@ CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y
 CONFIG_MITIGATION_GDS=y
 CONFIG_MITIGATION_IBPB_ENTRY=y
 CONFIG_MITIGATION_IBRS_ENTRY=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_L1TF=y
 CONFIG_MITIGATION_MDS=y
 CONFIG_MITIGATION_MMIO_STALE_DATA=y
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@ -3799,6 +3799,7 @@ CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y
 CONFIG_MITIGATION_GDS=y
 CONFIG_MITIGATION_IBPB_ENTRY=y
 CONFIG_MITIGATION_IBRS_ENTRY=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_L1TF=y
 CONFIG_MITIGATION_MDS=y
 CONFIG_MITIGATION_MMIO_STALE_DATA=y
--- a/kernel-x86_64-rt-fedora.config
+++ b/kernel-x86_64-rt-fedora.config
@ -4245,6 +4245,7 @@ CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y
 CONFIG_MITIGATION_GDS=y
 CONFIG_MITIGATION_IBPB_ENTRY=y
 CONFIG_MITIGATION_IBRS_ENTRY=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_L1TF=y
 CONFIG_MITIGATION_MDS=y
 CONFIG_MITIGATION_MMIO_STALE_DATA=y
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@ -3779,6 +3779,7 @@ CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y
 CONFIG_MITIGATION_GDS=y
 CONFIG_MITIGATION_IBPB_ENTRY=y
 CONFIG_MITIGATION_IBRS_ENTRY=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_L1TF=y
 CONFIG_MITIGATION_MDS=y
 CONFIG_MITIGATION_MMIO_STALE_DATA=y
--- a/kernel.changelog
+++ b/kernel.changelog
@ -1,3 +1,12 @@
+* Sun May 18 2025 Justin M. Forbes <jforbes@fedoraproject.org> [6.14.7-0]
+- Turn on MITIGATION_ITS for RHEL configs (Justin M. Forbes)
+- Add bug to Bugsfixed for 6.14.7 (Justin M. Forbes)
+- powerpc/bpf: fix JIT code size calculation of bpf trampoline (Hari Bathini)
+- Set MITIGATION_ITS for Fedora (Justin M. Forbes)
+- Fedora 40 is EOL (Justin M. Forbes)
+- Linux v6.14.7
+Resolves: 
+
 * Fri May 09 2025 Augusto Caringi <acaringi@redhat.com> [6.14.6-0]
 - platform/x86/intel/pmc: Add Arrow Lake U/H support to intel_pmc_core driver (Xi Pardee)
 - platform/x86:intel/pmc: Move arch specific action to init function (Xi Pardee)
--- a/kernel.spec
+++ b/kernel.spec
@ -159,18 +159,18 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 # define buildid .local
-%define specrpmversion 6.14.6
-%define specversion 6.14.6
+%define specrpmversion 6.14.7
+%define specversion 6.14.7
 %define patchversion 6.14
 %define pkgrelease 200
 %define kversion 6
-%define tarfile_release 6.14.6
+%define tarfile_release 6.14.7
 # This is needed to do merge window version magic
 %define patchlevel 14
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 200%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.14.6
+%define kabiversion 6.14.7

 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@ -4205,6 +4205,14 @@ fi\
 #
 #
 %changelog
+* Sun May 18 2025 Justin M. Forbes <jforbes@fedoraproject.org> [6.14.7-0]
+- Turn on MITIGATION_ITS for RHEL configs (Justin M. Forbes)
+- Add bug to Bugsfixed for 6.14.7 (Justin M. Forbes)
+- powerpc/bpf: fix JIT code size calculation of bpf trampoline (Hari Bathini)
+- Set MITIGATION_ITS for Fedora (Justin M. Forbes)
+- Fedora 40 is EOL (Justin M. Forbes)
+- Linux v6.14.7
+
 * Fri May 09 2025 Augusto Caringi <acaringi@redhat.com> [6.14.6-0]
 - platform/x86/intel/pmc: Add Arrow Lake U/H support to intel_pmc_core driver (Xi Pardee)
 - platform/x86:intel/pmc: Move arch specific action to init function (Xi Pardee)
--- a/patch-6.14-redhat.patch
+++ b/patch-6.14-redhat.patch
@ -7,6 +7,10 @@
 arch/powerpc/include/asm/prom.h                    |    2 +
 arch/powerpc/kernel/fadump.c                       |   21 +-
 arch/powerpc/kernel/prom_init.c                    |    2 +-
+ arch/powerpc/net/bpf_jit.h                         |   20 +-
+ arch/powerpc/net/bpf_jit_comp.c                    |   33 +-
+ arch/powerpc/net/bpf_jit_comp32.c                  |    6 -
+ arch/powerpc/net/bpf_jit_comp64.c                  |   15 +-
 arch/s390/include/asm/ipl.h                        |    1 +
 arch/s390/kernel/ipl.c                             |    5 +
 arch/s390/kernel/setup.c                           |    4 +
@ -64,7 +68,7 @@
 security/integrity/platform_certs/load_uefi.c      |    6 +-
 security/lockdown/Kconfig                          |   13 +
 security/lockdown/lockdown.c                       |   11 +
- 66 files changed, 3062 insertions(+), 620 deletions(-)
+ 70 files changed, 3097 insertions(+), 659 deletions(-)

 diff --git a/Documentation/ABI/testing/sysfs-kernel-fadump b/Documentation/ABI/testing/sysfs-kernel-fadump
 index 2f9daa7ca55b..b64b7622e6fc 100644
@ -139,7 +143,7 @@ index 00e94bec401e..292b51652cca 100644
 M:	Jimmy Su <jimmy.su@intel.com>
 L:	linux-media@vger.kernel.org
 diff --git a/Makefile b/Makefile
-index 6c3233a21380..1fc0f912e778 100644
+index 70bd8847c867..870ed6a45aa8 100644
 --- a/Makefile
 +++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -300,6 +304,189 @@ index 57082fac4668..fce32b162ef3 100644
 		.min_load = cpu_to_be32(0xffffffff),	/* full client load */
 		.min_rma_percent = 0,	/* min RMA percentage of total RAM */
 		.max_pft_size = 48,	/* max log_2(hash table size) */
+diff --git a/arch/powerpc/net/bpf_jit.h b/arch/powerpc/net/bpf_jit.h
+index 6beacaec63d3..4c26912c2e3c 100644
+--- a/arch/powerpc/net/bpf_jit.h
+++ b/arch/powerpc/net/bpf_jit.h
+@@ -51,8 +51,16 @@
+ 		EMIT(PPC_INST_BRANCH_COND | (((cond) & 0x3ff) << 16) | (offset & 0xfffc));					\
+ 	} while (0)
+ 
+-/* Sign-extended 32-bit immediate load */
+/*
+ * Sign-extended 32-bit immediate load
+ *
+ * If this is a dummy pass (!image), account for
+ * maximum possible instructions.
+ */
+ #define PPC_LI32(d, i)		do {					      \
+	if (!image)							      \
+		ctx->idx += 2;						      \
+	else {								      \
+ 		if ((int)(uintptr_t)(i) >= -32768 &&			      \
+ 				(int)(uintptr_t)(i) < 32768)		      \
+ 			EMIT(PPC_RAW_LI(d, i));				      \
+@@ -60,10 +68,15 @@
+ 			EMIT(PPC_RAW_LIS(d, IMM_H(i)));			      \
+ 			if (IMM_L(i))					      \
+ 				EMIT(PPC_RAW_ORI(d, d, IMM_L(i)));	      \
+-		} } while(0)
+		}							      \
+	} } while (0)
+ 
+ #ifdef CONFIG_PPC64
+/* If dummy pass (!image), account for maximum possible instructions */
+ #define PPC_LI64(d, i)		do {					      \
+	if (!image)							      \
+		ctx->idx += 5;						      \
+	else {								      \
+ 		if ((long)(i) >= -2147483648 &&				      \
+ 				(long)(i) < 2147483648)			      \
+ 			PPC_LI32(d, i);					      \
+@@ -84,7 +97,8 @@
+ 			if ((uintptr_t)(i) & 0x000000000000ffffULL)	      \
+ 				EMIT(PPC_RAW_ORI(d, d, (uintptr_t)(i) &       \
+ 							0xffff));             \
+-		} } while (0)
+		}							      \
+	} } while (0)
+ #define PPC_LI_ADDR	PPC_LI64
+ 
+ #ifndef CONFIG_PPC_KERNEL_PCREL
+diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
+index 2991bb171a9b..c0684733e9d6 100644
+--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
+@@ -504,10 +504,11 @@ static int invoke_bpf_prog(u32 *image, u32 *ro_image, struct codegen_context *ct
+ 	EMIT(PPC_RAW_ADDI(_R3, _R1, regs_off));
+ 	if (!p->jited)
+ 		PPC_LI_ADDR(_R4, (unsigned long)p->insnsi);
+-	if (!create_branch(&branch_insn, (u32 *)&ro_image[ctx->idx], (unsigned long)p->bpf_func,
+-			   BRANCH_SET_LINK)) {
+-		if (image)
+-			image[ctx->idx] = ppc_inst_val(branch_insn);
+	/* Account for max possible instructions during dummy pass for size calculation */
+	if (image && !create_branch(&branch_insn, (u32 *)&ro_image[ctx->idx],
+				    (unsigned long)p->bpf_func,
+				    BRANCH_SET_LINK)) {
+		image[ctx->idx] = ppc_inst_val(branch_insn);
+ 		ctx->idx++;
+ 	} else {
+ 		EMIT(PPC_RAW_LL(_R12, _R25, offsetof(struct bpf_prog, bpf_func)));
+@@ -889,7 +890,8 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_im
+ 			bpf_trampoline_restore_tail_call_cnt(image, ctx, func_frame_offset, r4_off);
+ 
+ 		/* Reserve space to patch branch instruction to skip fexit progs */
+-		im->ip_after_call = &((u32 *)ro_image)[ctx->idx];
+		if (ro_image) /* image is NULL for dummy pass */
+			im->ip_after_call = &((u32 *)ro_image)[ctx->idx];
+ 		EMIT(PPC_RAW_NOP());
+ 	}
+ 
+@@ -912,7 +914,8 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_im
+ 		}
+ 
+ 	if (flags & BPF_TRAMP_F_CALL_ORIG) {
+-		im->ip_epilogue = &((u32 *)ro_image)[ctx->idx];
+		if (ro_image) /* image is NULL for dummy pass */
+			im->ip_epilogue = &((u32 *)ro_image)[ctx->idx];
+ 		PPC_LI_ADDR(_R3, im);
+ 		ret = bpf_jit_emit_func_call_rel(image, ro_image, ctx,
+ 						 (unsigned long)__bpf_tramp_exit);
+@@ -973,25 +976,9 @@ int arch_bpf_trampoline_size(const struct btf_func_model *m, u32 flags,
+ 			     struct bpf_tramp_links *tlinks, void *func_addr)
+ {
+ 	struct bpf_tramp_image im;
+-	void *image;
+ 	int ret;
+ 
+-	/*
+-	 * Allocate a temporary buffer for __arch_prepare_bpf_trampoline().
+-	 * This will NOT cause fragmentation in direct map, as we do not
+-	 * call set_memory_*() on this buffer.
+-	 *
+-	 * We cannot use kvmalloc here, because we need image to be in
+-	 * module memory range.
+-	 */
+-	image = bpf_jit_alloc_exec(PAGE_SIZE);
+-	if (!image)
+-		return -ENOMEM;
+-
+-	ret = __arch_prepare_bpf_trampoline(&im, image, image + PAGE_SIZE, image,
+-					    m, flags, tlinks, func_addr);
+-	bpf_jit_free_exec(image);
+-
+	ret = __arch_prepare_bpf_trampoline(&im, NULL, NULL, NULL, m, flags, tlinks, func_addr);
+ 	return ret;
+ }
+ 
+diff --git a/arch/powerpc/net/bpf_jit_comp32.c b/arch/powerpc/net/bpf_jit_comp32.c
+index c4db278dae36..0aace304dfe1 100644
+--- a/arch/powerpc/net/bpf_jit_comp32.c
+++ b/arch/powerpc/net/bpf_jit_comp32.c
+@@ -313,7 +313,6 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, u32 *fimage, struct code
+ 		u64 func_addr;
+ 		u32 true_cond;
+ 		u32 tmp_idx;
+-		int j;
+ 
+ 		if (i && (BPF_CLASS(code) == BPF_ALU64 || BPF_CLASS(code) == BPF_ALU) &&
+ 		    (BPF_CLASS(prevcode) == BPF_ALU64 || BPF_CLASS(prevcode) == BPF_ALU) &&
+@@ -1099,13 +1098,8 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, u32 *fimage, struct code
+ 		 * 16 byte instruction that uses two 'struct bpf_insn'
+ 		 */
+ 		case BPF_LD | BPF_IMM | BPF_DW: /* dst = (u64) imm */
+-			tmp_idx = ctx->idx;
+ 			PPC_LI32(dst_reg_h, (u32)insn[i + 1].imm);
+ 			PPC_LI32(dst_reg, (u32)insn[i].imm);
+-			/* padding to allow full 4 instructions for later patching */
+-			if (!image)
+-				for (j = ctx->idx - tmp_idx; j < 4; j++)
+-					EMIT(PPC_RAW_NOP());
+ 			/* Adjust for two bpf instructions */
+ 			addrs[++i] = ctx->idx * 4;
+ 			break;
+diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c
+index 233703b06d7c..5daa77aee7f7 100644
+--- a/arch/powerpc/net/bpf_jit_comp64.c
+++ b/arch/powerpc/net/bpf_jit_comp64.c
+@@ -227,7 +227,14 @@ int bpf_jit_emit_func_call_rel(u32 *image, u32 *fimage, struct codegen_context *
+ #ifdef CONFIG_PPC_KERNEL_PCREL
+ 	reladdr = func_addr - local_paca->kernelbase;
+ 
+-	if (reladdr < (long)SZ_8G && reladdr >= -(long)SZ_8G) {
+	/*
+	 * If fimage is NULL (the initial pass to find image size),
+	 * account for the maximum no. of instructions possible.
+	 */
+	if (!fimage) {
+		ctx->idx += 7;
+		return 0;
+	} else if (reladdr < (long)SZ_8G && reladdr >= -(long)SZ_8G) {
+ 		EMIT(PPC_RAW_LD(_R12, _R13, offsetof(struct paca_struct, kernelbase)));
+ 		/* Align for subsequent prefix instruction */
+ 		if (!IS_ALIGNED((unsigned long)fimage + CTX_NIA(ctx), 8))
+@@ -412,7 +419,6 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, u32 *fimage, struct code
+ 		u64 imm64;
+ 		u32 true_cond;
+ 		u32 tmp_idx;
+-		int j;
+ 
+ 		/*
+ 		 * addrs[] maps a BPF bytecode address into a real offset from
+@@ -1046,12 +1052,7 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, u32 *fimage, struct code
+ 		case BPF_LD | BPF_IMM | BPF_DW: /* dst = (u64) imm */
+ 			imm64 = ((u64)(u32) insn[i].imm) |
+ 				    (((u64)(u32) insn[i+1].imm) << 32);
+-			tmp_idx = ctx->idx;
+ 			PPC_LI64(dst_reg, imm64);
+-			/* padding to allow full 5 instructions for later patching */
+-			if (!image)
+-				for (j = ctx->idx - tmp_idx; j < 5; j++)
+-					EMIT(PPC_RAW_NOP());
+ 			/* Adjust for two bpf instructions */
+ 			addrs[++i] = ctx->idx * 4;
+ 			break;
 diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
 index b0d00032479d..afb9544fb007 100644
 --- a/arch/s390/include/asm/ipl.h
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-6.14.6.tar.xz) = d6a37b20c83283a69e4297271f5a24ace31e0ef9ab45c48a45fe0b203532e2d2a718205c1938bb3ed439be9502fd3699fd514bbf4e124ffd12612a5a4f3a55d7
-SHA512 (kernel-abi-stablelists-6.14.6.tar.xz) = e417ca7a63b9a49a7944dde80da16ddfc5ed193d243dcefd7fa5fb622671e6d61e196b321eb5c3bc0827265bffa8f729ee3bcc45259e74b117171b168bc5e09e
-SHA512 (kernel-kabi-dw-6.14.6.tar.xz) = 9ef50b2a445d34fdd8c3d7660e645b959505904208a39d9509093f16dc9051663e4683dff85092b9215a0eb0fe22cfd3d07146a60d56e1a0c6731a3ec7e6505d
+SHA512 (linux-6.14.7.tar.xz) = 767421666bdc34f4cdc3f010e4e22a038b3588597ad2027988ebabad4c1b683e4c86fd6e54380f6befd61e4350884442299fe1522adbe93a72a3f05cd2cb9a85
+SHA512 (kernel-abi-stablelists-6.14.7.tar.xz) = ab0ec64e56f039ea239e2633640f6b9a486d1194ce8818bf712d75480c1f3893d430133a794796b3a6ce73fd6af3a5949a479d2d702de374d1e628c9e9698b0b
+SHA512 (kernel-kabi-dw-6.14.7.tar.xz) = 100d98de68e44dae21026f596cda45611556515bda998bd53572a7bea9ff1c616a9aa8d189498bece04fc4d3c594bbf9ef3b5fa0b7bc840ef3bd97fe2b8eb0d3