Re: FAILED: patch "[PATCH] arm64: kexec_file: use more system keyrings to verify kernel" failed to apply to 5.10-stable tree

On Fri, Aug 19, 2022 at 04:44:27PM +0200, Greg KH wrote:

On Thu, Aug 18, 2022 at 12:15:36PM +0800, Coiby Xu wrote:

...

Hi Greg,

This patch depends on three prerequisites. This full list of commit ids should be backported is shown below,

1. 65d9a9a60fd7 ("kexec_file: drop weak attribute from functions")
2. 689a71493bd2 ("kexec: clean up arch_kexec_kernel_verify_sig")
3. c903dae8941d ("kexec, KEYS: make the code in bzImage64_verify_sig generic")
4. 0d519cadf751 ("arm64: kexec_file: use more system keyrings to verify kernel image signature")

$ git checkout -b arm_key_5.10.y stable/linux-5.10.y Updating files: 100% (33255/33255), done. branch 'arm_key_5.10.y' set up to track 'stable/linux-5.10.y'. Switched to a new branch 'arm_key_5.10.y' $ git cherry-pick 65d9a9a60fd7 689a71493bd2 c903dae8941d 0d519cadf751 Auto-merging arch/arm64/include/asm/kexec.h Auto-merging arch/powerpc/include/asm/kexec.h Auto-merging arch/s390/include/asm/kexec.h Auto-merging arch/x86/include/asm/kexec.h Auto-merging include/linux/kexec.h Auto-merging kernel/kexec_file.c [arm_key_5.10.y 624dfcf3b8de] kexec_file: drop weak attribute from functions Author: Naveen N. Rao naveen.n.rao@linux.vnet.ibm.com Date: Fri Jul 1 13:04:04 2022 +0530 6 files changed, 61 insertions(+), 40 deletions(-) Auto-merging include/linux/kexec.h Auto-merging kernel/kexec_file.c [arm_key_5.10.y da8cfa52682e] kexec: clean up arch_kexec_kernel_verify_sig Date: Thu Jul 14 21:40:24 2022 +0800 2 files changed, 13 insertions(+), 25 deletions(-) Auto-merging arch/x86/kernel/kexec-bzimage64.c Auto-merging include/linux/kexec.h Auto-merging kernel/kexec_file.c [arm_key_5.10.y 0bb032082ce6] kexec, KEYS: make the code in bzImage64_verify_sig generic Date: Thu Jul 14 21:40:25 2022 +0800 3 files changed, 25 insertions(+), 19 deletions(-) [arm_key_5.10.y fde64a36fa74] arm64: kexec_file: use more system keyrings to verify kernel image signature Date: Thu Jul 14 21:40:26 2022 +0800 1 file changed, 1 insertion(+), 10 deletions(-)

Now queued up, thanks.

Ooops, nope, that broke the build:

ld: kernel/kexec_file.o: in function `kimage_file_post_load_cleanup': kexec_file.c:(.text+0xde0): undefined reference to `arch_kimage_file_post_load_cleanup' make: *** [Makefile:1193: vmlinux] Error 1

Please send me the full set of patches needed here to get this to work, if it's really needed in the 5.10.y tree.

thanks,

greg k-h