mirror of
https://github.com/torvalds/linux.git
synced 2024-12-13 22:53:20 +00:00
40c50c1fec
The purgatory code defines global variables which are referenced via a
symbol lookup in the kexec code (core and arch).
A recent commit addressing sparse warnings made these static and thereby
broke kexec_file.
Why did this happen? Simply because the whole machinery is undocumented and
lacks any form of forward declarations. The variable names are unspecific
and lack a prefix, so adding forward declarations creates shadow variables
in the core code. Aside of that the code relies on magic constants and
duplicate struct definitions with no way to ensure that these things stay
in sync. The section placement of the purgatory variables happened by
chance and not by design.
Unbreak kexec and cleanup the mess:
- Add proper forward declarations and document the usage
- Use common struct definition
- Use the proper common defines instead of magic constants
- Add a purgatory_ prefix to have a proper name space
- Use ARRAY_SIZE() instead of a homebrewn reimplementation
- Add proper sections to the purgatory variables [ From Mike ]
Fixes: 72042a8c7b ("x86/purgatory: Make functions and variables static")
Reported-by: Mike Galbraith <<efault@gmx.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Nicholas Mc Guire <der.herr@hofr.at>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: "Tobin C. Harding" <me@tobin.cc>
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1703101315140.3681@nanos
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
73 lines
1.7 KiB
C
73 lines
1.7 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 <asm/purgatory.h>
|
|
|
|
#include "sha256.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();
|
|
}
|