Commit df6f2801 authored by Philipp Rudo's avatar Philipp Rudo Committed by Linus Torvalds
Browse files

kernel/kexec_file.c: move purgatories sha256 to common code 

The code to verify the new kernels sha digest is applicable for all
architectures.  Move it to common code.

One problem is the string.c implementation on x86.  Currently sha256
includes x86/boot/string.h which defines memcpy and memset to be gcc
builtins.  By moving the sha256 implementation to common code and
changing the include to linux/string.h both functions are no longer
defined.  Thus definitions have to be provided in x86/purgatory/string.c

Link: http://lkml.kernel.org/r/20180321112751.22196-12-prudo@linux.vnet.ibm.com


Signed-off-by: default avatarPhilipp Rudo <prudo@linux.vnet.ibm.com>
Acked-by: default avatarDave Young <dyoung@redhat.com>
Cc: AKASHI Takahiro <takahiro.akashi@linaro.org>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3be3f61d

arch/x86/purgatory/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -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

arch/x86/purgatory/purgatory.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/x86/purgatory/string.c

+12 −0
Original line number Diff line number Diff line
@@ -10,4 +10,16 @@ 
 * Version 2.  See the file COPYING for more details.

 */



#include <linux/types.h>



#include "../boot/string.c"



void *memcpy(void *dst, const void *src, size_t len)

{

	return __builtin_memcpy(dst, src, len);

}



void *memset(void *dst, int c, size_t len)

{

	return __builtin_memset(dst, c, len);

}

arch/x86/purgatory/sha256.h→include/linux/sha256.h

+10 −1
Original line number Diff line number Diff line
@@ -13,6 +13,15 @@ 
#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);

arch/x86/purgatory/sha256.c→lib/sha256.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE