|
 |
36d4f3 |
From c1a07a5329c0b7db0ec54eea093e5d2d77735c06 Mon Sep 17 00:00:00 2001
|
|
|
36d4f3 |
From: Joe Lawrence <joe.lawrence@redhat.com>
|
|
|
36d4f3 |
Date: Fri, 9 Dec 2022 15:37:49 -0500
|
|
|
36d4f3 |
Subject: [PATCH] v0.9.2 backport: MR!1200 ("Make sure section symbols exist")
|
|
|
36d4f3 |
Content-type: text/plain
|
|
|
36d4f3 |
|
|
|
36d4f3 |
commit 5622e3cc3d393fd77866b9838d16cd064de6fba5
|
|
|
36d4f3 |
Author: Artem Savkov <asavkov@redhat.com>
|
|
|
36d4f3 |
Date: Fri Jun 18 10:59:26 2021 +0200
|
|
|
36d4f3 |
|
|
|
36d4f3 |
Make sure section symbols exist
|
|
|
36d4f3 |
|
|
|
36d4f3 |
Binutils recently became much more aggressive about removing unused
|
|
|
36d4f3 |
section symbols. Since we can not rely on those being available anymore
|
|
|
36d4f3 |
add additional checks before using them.
|
|
|
36d4f3 |
|
|
|
36d4f3 |
Fixes: #1193
|
|
|
36d4f3 |
|
|
|
36d4f3 |
Signed-off-by: Artem Savkov <asavkov@redhat.com>
|
|
|
36d4f3 |
|
|
|
36d4f3 |
Fixes: KLP-216 ("Backport kpatch-build section symbol check")
|
|
|
36d4f3 |
Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
|
|
|
36d4f3 |
---
|
|
|
36d4f3 |
kpatch-build/create-diff-object.c | 15 ++++++++++-----
|
|
|
36d4f3 |
1 file changed, 10 insertions(+), 5 deletions(-)
|
|
|
36d4f3 |
|
|
|
36d4f3 |
diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c
|
|
|
36d4f3 |
index c9afe33bbdae..94879b5fce6a 100644
|
|
|
36d4f3 |
--- a/kpatch-build/create-diff-object.c
|
|
|
36d4f3 |
+++ b/kpatch-build/create-diff-object.c
|
|
|
36d4f3 |
@@ -1241,7 +1241,8 @@ static void kpatch_correlate_static_local_variables(struct kpatch_elf *base,
|
|
|
36d4f3 |
if (bundled && sym->sec->twin) {
|
|
|
36d4f3 |
UNCORRELATE_ELEMENT(sym->sec);
|
|
|
36d4f3 |
|
|
|
36d4f3 |
- UNCORRELATE_ELEMENT(sym->sec->secsym);
|
|
|
36d4f3 |
+ if (sym->sec->secsym)
|
|
|
36d4f3 |
+ UNCORRELATE_ELEMENT(sym->sec->secsym);
|
|
|
36d4f3 |
|
|
|
36d4f3 |
if (sym->sec->rela)
|
|
|
36d4f3 |
UNCORRELATE_ELEMENT(sym->sec->rela);
|
|
|
36d4f3 |
@@ -1744,7 +1745,7 @@ static int kpatch_include_callback_elements(struct kpatch_elf *kelf)
|
|
|
36d4f3 |
sym = rela->sym;
|
|
|
36d4f3 |
log_normal("found callback: %s\n",sym->name);
|
|
|
36d4f3 |
kpatch_include_symbol(sym);
|
|
|
36d4f3 |
- } else {
|
|
|
36d4f3 |
+ } else if (sec->secsym) {
|
|
|
36d4f3 |
sec->secsym->include = 1;
|
|
|
36d4f3 |
}
|
|
|
36d4f3 |
}
|
|
|
36d4f3 |
@@ -1772,7 +1773,8 @@ static void kpatch_include_force_elements(struct kpatch_elf *kelf)
|
|
|
36d4f3 |
sec->include = 1;
|
|
|
36d4f3 |
if (!is_rela_section(sec)) {
|
|
|
36d4f3 |
/* .kpatch.force */
|
|
|
36d4f3 |
- sec->secsym->include = 1;
|
|
|
36d4f3 |
+ if (sec->secsym)
|
|
|
36d4f3 |
+ sec->secsym->include = 1;
|
|
|
36d4f3 |
continue;
|
|
|
36d4f3 |
}
|
|
|
36d4f3 |
/* .rela.kpatch.force */
|
|
|
36d4f3 |
@@ -2381,7 +2383,8 @@ static void kpatch_regenerate_special_section(struct kpatch_elf *kelf,
|
|
|
36d4f3 |
sec->include = 1;
|
|
|
36d4f3 |
sec->base->include = 1;
|
|
|
36d4f3 |
/* include secsym so .kpatch.arch relas can point to section symbols */
|
|
|
36d4f3 |
- sec->base->secsym->include = 1;
|
|
|
36d4f3 |
+ if (sec->base->secsym)
|
|
|
36d4f3 |
+ sec->base->secsym->include = 1;
|
|
|
36d4f3 |
|
|
|
36d4f3 |
/*
|
|
|
36d4f3 |
* Update text section data buf and size.
|
|
|
36d4f3 |
@@ -2564,7 +2567,9 @@ static void kpatch_mark_ignored_sections(struct kpatch_elf *kelf)
|
|
|
36d4f3 |
* from the section data comparison, but this is a simpler way.
|
|
|
36d4f3 |
*/
|
|
|
36d4f3 |
strsec->include = 1;
|
|
|
36d4f3 |
- strsec->secsym->include = 1;
|
|
|
36d4f3 |
+ if (strsec->secsym)
|
|
|
36d4f3 |
+ strsec->secsym->include = 1;
|
|
|
36d4f3 |
+
|
|
|
36d4f3 |
name = strsec->data->d_buf + rela->addend;
|
|
|
36d4f3 |
ignoresec = find_section_by_name(&kelf->sections, name);
|
|
|
36d4f3 |
if (!ignoresec)
|
|
|
36d4f3 |
--
|
|
|
36d4f3 |
2.38.1
|
|
|
36d4f3 |
|