From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751990AbeBBNLS (ORCPT ); Fri, 2 Feb 2018 08:11:18 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:48768 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751856AbeBBNHj (ORCPT ); Fri, 2 Feb 2018 08:07:39 -0500 From: Philipp Rudo To: kexec@lists.infradead.org, linux-s390@vger.kernel.org Cc: prudo@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, Eric Biederman , Vivek Goyal , Michael Ellerman , Thiago Jung Bauermann , Martin Schwidefsky , Heiko Carstens Subject: [PATCH 11/17] kexec_file: Move purgatories sha256 to common code Date: Fri, 2 Feb 2018 14:07:12 +0100 X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180202130718.35509-1-prudo@linux.vnet.ibm.com> References: <20180202130718.35509-1-prudo@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18020213-0040-0000-0000-0000040BC087 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18020213-0041-0000-0000-0000260F6495 Message-Id: <20180202130718.35509-12-prudo@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-02-02_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1802020162 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The code to verify the new kernels sha digest are applicable for all architectures. Move it to common code. Signed-off-by: Philipp Rudo --- 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 +#include #include -#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 #include +/* 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 +#include +#include #include -#include "sha256.h" -#include "../boot/string.h" static inline u32 Ch(u32 x, u32 y, u32 z) { -- 2.13.5 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5] helo=mx0a-001b2d01.pphosted.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ehb4J-0007sL-3n for kexec@lists.infradead.org; Fri, 02 Feb 2018 13:07:57 +0000 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w12D6hmD006474 for ; Fri, 2 Feb 2018 08:07:39 -0500 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 2fvqqqjaw3-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 02 Feb 2018 08:07:38 -0500 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 2 Feb 2018 13:07:37 -0000 From: Philipp Rudo Subject: [PATCH 11/17] kexec_file: Move purgatories sha256 to common code Date: Fri, 2 Feb 2018 14:07:12 +0100 In-Reply-To: <20180202130718.35509-1-prudo@linux.vnet.ibm.com> References: <20180202130718.35509-1-prudo@linux.vnet.ibm.com> Message-Id: <20180202130718.35509-12-prudo@linux.vnet.ibm.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: kexec@lists.infradead.org, linux-s390@vger.kernel.org Cc: prudo@linux.vnet.ibm.com, Michael Ellerman , Heiko Carstens , linux-kernel@vger.kernel.org, Martin Schwidefsky , Eric Biederman , Thiago Jung Bauermann , Vivek Goyal The code to verify the new kernels sha digest are applicable for all architectures. Move it to common code. Signed-off-by: Philipp Rudo --- 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 +#include #include -#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 #include +/* 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 +#include +#include #include -#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