Skip to content

Commit 5795313

Browse files
author
Denis Aleksandrov
committed
livepatch: Fix build failure on 32 bits processors
JIRA: https://issues.redhat.com/browse/RHEL-85303 Trying to build livepatch on powerpc/32 results in: kernel/livepatch/core.c: In function 'klp_resolve_symbols': kernel/livepatch/core.c:221:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 221 | sym = (Elf64_Sym *)sechdrs[symndx].sh_addr + ELF_R_SYM(relas[i].r_info); | ^ kernel/livepatch/core.c:221:21: error: assignment to 'Elf32_Sym *' {aka 'struct elf32_sym *'} from incompatible pointer type 'Elf64_Sym *' {aka 'struct elf64_sym *'} [-Werror=incompatible-pointer-types] 221 | sym = (Elf64_Sym *)sechdrs[symndx].sh_addr + ELF_R_SYM(relas[i].r_info); | ^ kernel/livepatch/core.c: In function 'klp_apply_section_relocs': kernel/livepatch/core.c:312:35: error: passing argument 1 of 'klp_resolve_symbols' from incompatible pointer type [-Werror=incompatible-pointer-types] 312 | ret = klp_resolve_symbols(sechdrs, strtab, symndx, sec, sec_objname); | ^~~~~~~ | | | Elf32_Shdr * {aka struct elf32_shdr *} kernel/livepatch/core.c:193:44: note: expected 'Elf64_Shdr *' {aka 'struct elf64_shdr *'} but argument is of type 'Elf32_Shdr *' {aka 'struct elf32_shdr *'} 193 | static int klp_resolve_symbols(Elf64_Shdr *sechdrs, const char *strtab, | ~~~~~~~~~~~~^~~~~~~ Fix it by using the right types instead of forcing 64 bits types. Fixes: 7c8e2bd ("livepatch: Apply vmlinux-specific KLP relocations early") Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Acked-by: Petr Mladek <pmladek@suse.com> Acked-by: Joe Lawrence <joe.lawrence@redhat.com> Acked-by: Miroslav Benes <mbenes@suse.cz> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/5288e11b018a762ea3351cc8fb2d4f15093a4457.1640017960.git.christophe.leroy@csgroup.eu (cherry picked from commit 2f29365) Signed-off-by: Denis Aleksandrov <daleksan@redhat.com>
1 parent 2f93fda commit 5795313

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/livepatch/core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ static int klp_find_object_symbol(const char *objname, const char *name,
182182
return -EINVAL;
183183
}
184184

185-
static int klp_resolve_symbols(Elf64_Shdr *sechdrs, const char *strtab,
185+
static int klp_resolve_symbols(Elf_Shdr *sechdrs, const char *strtab,
186186
unsigned int symndx, Elf_Shdr *relasec,
187187
const char *sec_objname)
188188
{
@@ -210,7 +210,7 @@ static int klp_resolve_symbols(Elf64_Shdr *sechdrs, const char *strtab,
210210
relas = (Elf_Rela *) relasec->sh_addr;
211211
/* For each rela in this klp relocation section */
212212
for (i = 0; i < relasec->sh_size / sizeof(Elf_Rela); i++) {
213-
sym = (Elf64_Sym *)sechdrs[symndx].sh_addr + ELF_R_SYM(relas[i].r_info);
213+
sym = (Elf_Sym *)sechdrs[symndx].sh_addr + ELF_R_SYM(relas[i].r_info);
214214
if (sym->st_shndx != SHN_LIVEPATCH) {
215215
pr_err("symbol %s is not marked as a livepatch symbol\n",
216216
strtab + sym->st_name);

0 commit comments

Comments
 (0)