From: Philipp Rudo <prudo@redhat.com>
To: linux-s390@vger.kernel.org
Cc: hca@linux.ibm.com, egorenar@linux.ibm.com, ltao@redhat.com
Subject: [PATCH v2 1/2] s390/kexec_file: print some more error messages
Date: Tue, 7 Dec 2021 13:57:48 +0100 [thread overview]
Message-ID: <20211207125749.6998-2-prudo@redhat.com> (raw)
In-Reply-To: <20211207125749.6998-1-prudo@redhat.com>
Be kind and give some more information on what went wrong.
Signed-off-by: Philipp Rudo <prudo@redhat.com>
---
arch/s390/kernel/machine_kexec_file.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/arch/s390/kernel/machine_kexec_file.c b/arch/s390/kernel/machine_kexec_file.c
index 9975ad200d74..b53fa670e289 100644
--- a/arch/s390/kernel/machine_kexec_file.c
+++ b/arch/s390/kernel/machine_kexec_file.c
@@ -7,6 +7,8 @@
* Author(s): Philipp Rudo <prudo@linux.vnet.ibm.com>
*/
+#define pr_fmt(fmt) "kexec: " fmt
+
#include <linux/elf.h>
#include <linux/errno.h>
#include <linux/kexec.h>
@@ -304,15 +306,22 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
sym = (void *)pi->ehdr + symtab->sh_offset;
sym += ELF64_R_SYM(relas[i].r_info);
- if (sym->st_shndx == SHN_UNDEF)
+ if (sym->st_shndx == SHN_UNDEF) {
+ pr_err("Undefined symbol\n");
return -ENOEXEC;
+ }
- if (sym->st_shndx == SHN_COMMON)
+ if (sym->st_shndx == SHN_COMMON) {
+ pr_err("symbol in common section\n");
return -ENOEXEC;
+ }
if (sym->st_shndx >= pi->ehdr->e_shnum &&
- sym->st_shndx != SHN_ABS)
+ sym->st_shndx != SHN_ABS) {
+ pr_err("Invalid section %d for symbol\n",
+ sym->st_shndx);
return -ENOEXEC;
+ }
loc = pi->purgatory_buf;
loc += section->sh_offset;
--
2.31.1
next prev parent reply other threads:[~2021-12-07 12:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 12:57 [PATCH v2 0/2] s390/kexec_file: improve error handling and messages Philipp Rudo
2021-12-07 12:57 ` Philipp Rudo [this message]
2021-12-07 15:29 ` [PATCH v2 1/2] s390/kexec_file: print some more error messages Heiko Carstens
2021-12-07 17:18 ` Philipp Rudo
2021-12-07 17:40 ` Heiko Carstens
2021-12-07 12:57 ` [PATCH v2 2/2] s390/kexec_file: fix error handling when applying relocations Philipp Rudo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211207125749.6998-2-prudo@redhat.com \
--to=prudo@redhat.com \
--cc=egorenar@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=ltao@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).