From 951cf9d7b04aacef35a8116e9b5a48abcd35d899 Mon Sep 17 00:00:00 2001 From: Mikhail Zaslonko Date: Thu, 15 Jun 2023 21:51:42 +0200 Subject: [PATCH] zipl/boot: Reuse os_info_valid() in kdump_os_info_check() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mikhail Zaslonko Reviewed-by: Marc Hartmayer Signed-off-by: Jan Höppner --- zipl/boot/kdump.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/zipl/boot/kdump.c b/zipl/boot/kdump.c index f06654f8..f05d3b1e 100644 --- a/zipl/boot/kdump.c +++ b/zipl/boot/kdump.c @@ -23,17 +23,11 @@ void kdump_failed(unsigned long reason) void kdump_os_info_check(const struct os_info *os_info) { - if (os_info == NULL) - kdump_failed(EOS_INFO_MISSING); - if (((unsigned long) os_info) % PAGE_SIZE) - kdump_failed(EOS_INFO_MISSING); - if (!page_is_valid((unsigned long) os_info)) - kdump_failed(EOS_INFO_MISSING); - if (os_info->magic != OS_INFO_MAGIC) - kdump_failed(EOS_INFO_MISSING); - if (csum_partial(&os_info->version_major, OS_INFO_CSUM_SIZE, 0) != - os_info->csum) - kdump_failed(EOS_INFO_CSUM_FAILED); + int rc; + + rc = os_info_check(os_info); + if (rc < 0) + kdump_failed(-rc); if (os_info->version_major > OS_INFO_VERSION_MAJOR_SUPPORTED) kdump_failed(EOS_INFO_VERSION); if (os_info->crashkernel_addr == 0)