e0d262a57f
commit 4ce97317f41d38584fb93578e922fcd19e535f5b upstream.
Implementing memcpy and memset in terms of __builtin_memcpy and
__builtin_memset is problematic.
GCC at -O2 will replace calls to the builtins with calls to memcpy and
memset (but will generate an inline implementation at -Os). Clang will
replace the builtins with these calls regardless of optimization level.
$ llvm-objdump -dr arch/x86/purgatory/string.o | tail
0000000000000339 memcpy:
339: 48 b8 00 00 00 00 00 00 00 00 movabsq $0, %rax
000000000000033b: R_X86_64_64 memcpy
343: ff e0 jmpq *%rax
0000000000000345 memset:
345: 48 b8 00 00 00 00 00 00 00 00 movabsq $0, %rax
0000000000000347: R_X86_64_64 memset
34f: ff e0
Such code results in infinite recursion at runtime. This is observed
when doing kexec.
Instead, reuse an implementation from arch/x86/boot/compressed/string.c.
This requires to implement a stub function for warn(). Also, Clang may
lower memcmp's that compare against 0 to bcmp's, so add a small definition,
too. See also: commit 5f074f3e192f ("lib/string.c: implement a basic bcmp")
Fixes: 8fc5b4d412 ("purgatory: core purgatory functionality")
Reported-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
Debugged-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
Debugged-by: Manoj Gupta <manojgupta@google.com>
Suggested-by: Alistair Delva <adelva@google.com>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
Cc: stable@vger.kernel.org
Link: https://bugs.chromium.org/p/chromium/issues/detail?id=984056
Link: https://lkml.kernel.org/r/20190807221539.94583-1-ndesaulniers@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
78 lines
1.8 KiB
C
78 lines
1.8 KiB
C
/*
|
|
* purgatory: Runs between two kernels
|
|
*
|
|
* Copyright (C) 2014 Red Hat Inc.
|
|
*
|
|
* Author:
|
|
* Vivek Goyal <vgoyal@redhat.com>
|
|
*
|
|
* This source code is licensed under the GNU General Public License,
|
|
* Version 2. See the file COPYING for more details.
|
|
*/
|
|
|
|
#include <linux/bug.h>
|
|
#include <linux/sha256.h>
|
|
#include <asm/purgatory.h>
|
|
|
|
#include "../boot/string.h"
|
|
|
|
unsigned long purgatory_backup_dest __section(.kexec-purgatory);
|
|
unsigned long purgatory_backup_src __section(.kexec-purgatory);
|
|
unsigned long purgatory_backup_sz __section(.kexec-purgatory);
|
|
|
|
u8 purgatory_sha256_digest[SHA256_DIGEST_SIZE] __section(.kexec-purgatory);
|
|
|
|
struct kexec_sha_region purgatory_sha_regions[KEXEC_SEGMENT_MAX] __section(.kexec-purgatory);
|
|
|
|
/*
|
|
* On x86, second kernel requries first 640K of memory to boot. Copy
|
|
* first 640K to a backup region in reserved memory range so that second
|
|
* kernel can use first 640K.
|
|
*/
|
|
static int copy_backup_region(void)
|
|
{
|
|
if (purgatory_backup_dest) {
|
|
memcpy((void *)purgatory_backup_dest,
|
|
(void *)purgatory_backup_src, purgatory_backup_sz);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int verify_sha256_digest(void)
|
|
{
|
|
struct kexec_sha_region *ptr, *end;
|
|
u8 digest[SHA256_DIGEST_SIZE];
|
|
struct sha256_state sctx;
|
|
|
|
sha256_init(&sctx);
|
|
end = purgatory_sha_regions + ARRAY_SIZE(purgatory_sha_regions);
|
|
|
|
for (ptr = purgatory_sha_regions; ptr < end; ptr++)
|
|
sha256_update(&sctx, (uint8_t *)(ptr->start), ptr->len);
|
|
|
|
sha256_final(&sctx, digest);
|
|
|
|
if (memcmp(digest, purgatory_sha256_digest, sizeof(digest)))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void purgatory(void)
|
|
{
|
|
int ret;
|
|
|
|
ret = verify_sha256_digest();
|
|
if (ret) {
|
|
/* loop forever */
|
|
for (;;)
|
|
;
|
|
}
|
|
copy_backup_region();
|
|
}
|
|
|
|
/*
|
|
* Defined in order to reuse memcpy() and memset() from
|
|
* arch/x86/boot/compressed/string.c
|
|
*/
|
|
void warn(const char *msg) {}
|