From: Philipp Rudo <prudo@linux.vnet.ibm.com> To: kexec@lists.infradead.org, linux-s390@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Eric Biederman <ebiederm@xmission.com>, Vivek Goyal <vgoyal@redhat.com>, Michael Ellerman <mpe@ellerman.id.au>, Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, Andrew Morton <akpm@linux-foundation.org>, x86@kernel.org Subject: [PATCH 11/17] kexec_file: Move purgatories sha256 to common code Date: Mon, 12 Feb 2018 11:07:48 +0100 [thread overview] Message-ID: <20180212100754.55121-12-prudo@linux.vnet.ibm.com> (raw) In-Reply-To: <20180212100754.55121-1-prudo@linux.vnet.ibm.com> The code to verify the new kernels sha digest are applicable for all architectures. Move it to common code. Signed-off-by: Philipp Rudo <prudo@linux.vnet.ibm.com> --- arch/x86/purgatory/Makefile | 3 +++ arch/x86/purgatory/purgatory.c | 2 +- {arch/x86/purgatory => include/linux}/sha256.h | 10 +++++++++- {arch/x86/purgatory => lib}/sha256.c | 4 ++-- 4 files changed, 15 insertions(+), 4 deletions(-) rename {arch/x86/purgatory => include/linux}/sha256.h (63%) rename {arch/x86/purgatory => lib}/sha256.c (99%) diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index 2f15a2ac4209..414eed6b5065 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@ -6,6 +6,9 @@ purgatory-y := purgatory.o stack.o setup-x86_$(BITS).o sha256.o entry64.o string targets += $(purgatory-y) PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) +$(obj)/sha256.o: $(srctree)/lib/sha256.c + $(call if_changed_rule,cc_o_c) + LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib targets += purgatory.ro diff --git a/arch/x86/purgatory/purgatory.c b/arch/x86/purgatory/purgatory.c index 470edad96bb9..025c34ac0d84 100644 --- a/arch/x86/purgatory/purgatory.c +++ b/arch/x86/purgatory/purgatory.c @@ -11,9 +11,9 @@ */ #include <linux/bug.h> +#include <linux/sha256.h> #include <asm/purgatory.h> -#include "sha256.h" #include "../boot/string.h" unsigned long purgatory_backup_dest __section(.kexec-purgatory); diff --git a/arch/x86/purgatory/sha256.h b/include/linux/sha256.h similarity index 63% rename from arch/x86/purgatory/sha256.h rename to include/linux/sha256.h index 2867d9825a57..43a20ac33688 100644 --- a/arch/x86/purgatory/sha256.h +++ b/include/linux/sha256.h @@ -13,9 +13,17 @@ #include <linux/types.h> #include <crypto/sha.h> +/* Stand-alone implementation of the SHA256 algorithm. It is designed to + * have as little dependencies as possible so it can be used in the + * kexec_file purgatory. In other cases you should use the implementation in + * crypto/. + * + * For details see lib/sha256.c + */ + extern int sha256_init(struct sha256_state *sctx); extern int sha256_update(struct sha256_state *sctx, const u8 *input, - unsigned int length); + unsigned int length); extern int sha256_final(struct sha256_state *sctx, u8 *hash); #endif /* SHA256_H */ diff --git a/arch/x86/purgatory/sha256.c b/lib/sha256.c similarity index 99% rename from arch/x86/purgatory/sha256.c rename to lib/sha256.c index 548ca675a14a..4400c832e2aa 100644 --- a/arch/x86/purgatory/sha256.c +++ b/lib/sha256.c @@ -16,9 +16,9 @@ */ #include <linux/bitops.h> +#include <linux/sha256.h> +#include <linux/string.h> #include <asm/byteorder.h> -#include "sha256.h" -#include "../boot/string.h" static inline u32 Ch(u32 x, u32 y, u32 z) { -- 2.13.5
WARNING: multiple messages have this Message-ID (diff)
From: Philipp Rudo <prudo@linux.vnet.ibm.com> To: kexec@lists.infradead.org, linux-s390@vger.kernel.org Cc: Michael Ellerman <mpe@ellerman.id.au>, x86@kernel.org, Heiko Carstens <heiko.carstens@de.ibm.com>, linux-kernel@vger.kernel.org, Martin Schwidefsky <schwidefsky@de.ibm.com>, Eric Biederman <ebiederm@xmission.com>, Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>, Andrew Morton <akpm@linux-foundation.org>, Vivek Goyal <vgoyal@redhat.com> Subject: [PATCH 11/17] kexec_file: Move purgatories sha256 to common code Date: Mon, 12 Feb 2018 11:07:48 +0100 [thread overview] Message-ID: <20180212100754.55121-12-prudo@linux.vnet.ibm.com> (raw) In-Reply-To: <20180212100754.55121-1-prudo@linux.vnet.ibm.com> The code to verify the new kernels sha digest are applicable for all architectures. Move it to common code. Signed-off-by: Philipp Rudo <prudo@linux.vnet.ibm.com> --- arch/x86/purgatory/Makefile | 3 +++ arch/x86/purgatory/purgatory.c | 2 +- {arch/x86/purgatory => include/linux}/sha256.h | 10 +++++++++- {arch/x86/purgatory => lib}/sha256.c | 4 ++-- 4 files changed, 15 insertions(+), 4 deletions(-) rename {arch/x86/purgatory => include/linux}/sha256.h (63%) rename {arch/x86/purgatory => lib}/sha256.c (99%) diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index 2f15a2ac4209..414eed6b5065 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@ -6,6 +6,9 @@ purgatory-y := purgatory.o stack.o setup-x86_$(BITS).o sha256.o entry64.o string targets += $(purgatory-y) PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) +$(obj)/sha256.o: $(srctree)/lib/sha256.c + $(call if_changed_rule,cc_o_c) + LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib targets += purgatory.ro diff --git a/arch/x86/purgatory/purgatory.c b/arch/x86/purgatory/purgatory.c index 470edad96bb9..025c34ac0d84 100644 --- a/arch/x86/purgatory/purgatory.c +++ b/arch/x86/purgatory/purgatory.c @@ -11,9 +11,9 @@ */ #include <linux/bug.h> +#include <linux/sha256.h> #include <asm/purgatory.h> -#include "sha256.h" #include "../boot/string.h" unsigned long purgatory_backup_dest __section(.kexec-purgatory); diff --git a/arch/x86/purgatory/sha256.h b/include/linux/sha256.h similarity index 63% rename from arch/x86/purgatory/sha256.h rename to include/linux/sha256.h index 2867d9825a57..43a20ac33688 100644 --- a/arch/x86/purgatory/sha256.h +++ b/include/linux/sha256.h @@ -13,9 +13,17 @@ #include <linux/types.h> #include <crypto/sha.h> +/* Stand-alone implementation of the SHA256 algorithm. It is designed to + * have as little dependencies as possible so it can be used in the + * kexec_file purgatory. In other cases you should use the implementation in + * crypto/. + * + * For details see lib/sha256.c + */ + extern int sha256_init(struct sha256_state *sctx); extern int sha256_update(struct sha256_state *sctx, const u8 *input, - unsigned int length); + unsigned int length); extern int sha256_final(struct sha256_state *sctx, u8 *hash); #endif /* SHA256_H */ diff --git a/arch/x86/purgatory/sha256.c b/lib/sha256.c similarity index 99% rename from arch/x86/purgatory/sha256.c rename to lib/sha256.c index 548ca675a14a..4400c832e2aa 100644 --- a/arch/x86/purgatory/sha256.c +++ b/lib/sha256.c @@ -16,9 +16,9 @@ */ #include <linux/bitops.h> +#include <linux/sha256.h> +#include <linux/string.h> #include <asm/byteorder.h> -#include "sha256.h" -#include "../boot/string.h" static inline u32 Ch(u32 x, u32 y, u32 z) { -- 2.13.5 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2018-02-12 10:10 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-12 10:07 [PATCH 00/17] Add kexec_file_load support to s390 Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 01/17] kexec_file: Silence compile warnings Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 02/17] kexec_file: Remove checks in kexec_purgatory_load Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 03/17] kexec_file: Make purgatory_info->ehdr const Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 04/17] kexec_file: Search symbols in read-only kexec_purgatory Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 05/17] kexec_file: Use read-only sections in arch_kexec_apply_relocations* Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 06/17] kexec_file: Split up __kexec_load_puragory Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 07/17] kexec_file: Simplify kexec_purgatory_setup_sechdrs 1 Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 08/17] kexec_file: Simplify kexec_purgatory_setup_sechdrs 2 Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 09/17] kexec_file: Remove mis-use of sh_offset field Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 10/17] kexec_file: Allow archs to set purgatory load address Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo [this message] 2018-02-12 10:07 ` [PATCH 11/17] kexec_file: Move purgatories sha256 to common code Philipp Rudo 2018-02-12 10:07 ` [PATCH 12/17] s390/kexec_file: Prepare setup.h for kexec_file_load Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 13/17] s390/kexec_file: Add purgatory Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 14/17] s390/kexec_file: Add kexec_file_load system call Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:56 ` Philippe Ombredanne 2018-02-12 10:56 ` Philippe Ombredanne 2018-02-12 11:29 ` Philipp Rudo 2018-02-12 11:29 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 15/17] s390/kexec_file: Add image loader Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 16/17] s390/kexec_file: Add crash support to " Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-12 10:07 ` [PATCH 17/17] s390/kexec_file: Add ELF loader Philipp Rudo 2018-02-12 10:07 ` Philipp Rudo 2018-02-14 7:35 ` [PATCH 00/17] Add kexec_file_load support to s390 Dave Young 2018-02-14 7:35 ` Dave Young 2018-02-14 7:35 ` Dave Young 2018-02-14 9:54 ` Philipp Rudo 2018-02-14 9:54 ` Philipp Rudo 2018-02-15 5:08 ` AKASHI Takahiro 2018-02-15 5:08 ` AKASHI Takahiro 2018-02-23 8:34 ` Dave Young 2018-02-23 8:34 ` Dave Young 2018-02-23 10:01 ` Philipp Rudo 2018-02-23 10:01 ` Philipp Rudo 2018-02-24 1:59 ` Dave Young 2018-02-24 1:59 ` Dave Young 2018-02-26 1:21 ` AKASHI Takahiro 2018-02-26 1:21 ` AKASHI Takahiro 2018-02-26 11:16 ` Philipp Rudo 2018-02-26 11:16 ` Philipp Rudo -- strict thread matches above, loose matches on Subject: below -- 2018-02-02 13:07 Philipp Rudo 2018-02-02 13:07 ` [PATCH 11/17] kexec_file: Move purgatories sha256 to common code Philipp Rudo 2018-02-02 13:07 ` Philipp Rudo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180212100754.55121-12-prudo@linux.vnet.ibm.com \ --to=prudo@linux.vnet.ibm.com \ --cc=akpm@linux-foundation.org \ --cc=bauerman@linux.vnet.ibm.com \ --cc=ebiederm@xmission.com \ --cc=heiko.carstens@de.ibm.com \ --cc=kexec@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=mpe@ellerman.id.au \ --cc=schwidefsky@de.ibm.com \ --cc=vgoyal@redhat.com \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.