Christophe Leroy
b1af8b9ec0
livepatch: Fix build failure on 32 bits processors
[ Upstream commit 2f293651eca3eacaeb56747dede31edace7329d2 ]
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: 7c8e2bdd5f
("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
Signed-off-by: Sasha Levin <sashal@kernel.org>
2022-04-08 14:40:15 +02:00
..
2022-03-02 11:42:49 +01:00
2022-03-28 09:57:08 +02:00
2020-04-07 10:43:42 -07:00
2021-03-04 11:38:46 +01:00
2022-04-08 14:39:46 +02:00
2021-10-06 15:55:49 +02:00
2022-04-08 14:40:03 +02:00
2021-04-14 08:41:58 +02:00
2021-09-15 09:50:29 +02:00
2021-05-26 12:06:54 +02:00
2022-04-08 14:40:15 +02:00
2022-04-08 14:39:48 +02:00
2022-04-08 14:40:01 +02:00
2022-04-08 14:40:08 +02:00
2022-03-28 09:57:10 +02:00
2022-04-08 14:40:03 +02:00
2022-01-27 10:54:06 +01:00
2022-03-16 14:16:00 +01:00
2021-05-11 14:47:37 +02:00
2020-10-16 11:11:19 -07:00
2022-02-23 12:01:00 +01:00
2020-12-30 11:54:18 +01:00
2021-09-03 10:09:31 +02:00
2020-12-30 11:54:18 +01:00
2022-02-08 18:30:34 +01:00
2022-04-08 14:40:00 +02:00
2020-08-23 17:36:59 -05:00
2022-04-08 14:40:00 +02:00
2020-07-30 11:15:58 -07:00
2020-10-13 09:17:34 -07:00
2020-08-23 17:36:59 -05:00
2020-06-11 15:14:36 +02:00
2021-09-15 09:50:40 +02:00
2021-12-01 09:19:08 +01:00
2021-06-23 14:42:52 +02:00
2020-04-15 11:21:54 +02:00
2021-09-08 08:49:00 +02:00
2021-01-30 13:55:18 +01:00
2020-04-07 10:43:42 -07:00
2020-11-19 11:58:16 -08:00
2022-02-23 12:01:08 +01:00
2021-04-07 15:00:14 +02:00
2021-06-30 08:47:29 -04:00
2020-06-06 23:42:01 +09:00
2020-10-13 09:17:34 -07:00
2020-11-02 12:14:19 -08:00
2020-05-28 10:54:15 +02:00
2021-07-20 16:05:58 +02:00
2020-10-25 14:51:49 -07:00
2021-01-09 13:46:24 +01:00
2020-08-12 10:58:02 -07:00
2021-02-03 23:28:37 +01:00
2021-05-19 10:13:09 +02:00
2020-10-05 13:37:03 +02:00
2020-08-12 10:58:01 -07:00
2021-12-08 09:03:20 +01:00
2021-09-03 10:09:31 +02:00
2020-04-27 02:07:40 -04:00
2021-05-11 14:47:37 +02:00
2021-03-25 09:04:11 +01:00
2021-03-25 09:04:11 +01:00
2022-02-23 12:01:00 +01:00
2020-09-01 09:58:03 +02:00
2020-07-08 11:14:22 +02:00
2020-09-04 17:51:55 +10:00
2020-11-14 11:26:04 -08:00
2020-10-29 17:22:59 -05:00
2021-09-18 13:40:36 +02:00
2021-01-09 13:46:24 +01:00
2021-09-26 14:08:58 +02:00
2022-04-08 14:39:50 +02:00
2020-10-16 11:11:19 -07:00
2020-11-14 11:26:03 -08:00
2020-07-27 14:31:12 -04:00
2020-10-16 11:11:22 -07:00
2021-05-19 10:13:09 +02:00
2022-04-08 14:40:03 +02:00
2020-08-24 18:38:38 -07:00
2020-08-07 11:33:25 -07:00
2021-08-18 08:59:06 +02:00
2021-11-18 14:03:47 +01:00
2021-05-14 09:50:46 +02:00
2021-07-14 16:55:50 +02:00
2020-09-16 15:18:56 +02:00
2022-02-23 12:01:00 +01:00
2020-09-18 14:24:16 +01:00
2021-09-08 08:49:00 +02:00
2020-10-26 12:12:27 +01:00
2020-10-18 09:27:10 -07:00
2021-09-26 14:08:57 +02:00
2022-03-11 12:11:49 +01:00
2020-10-17 15:05:30 -06:00
2020-10-02 19:11:12 -07:00
2020-06-29 12:01:45 -07:00
2021-09-03 10:09:30 +02:00
2022-01-27 10:54:33 +01:00
2021-09-08 08:49:00 +02:00
2020-10-06 10:31:52 -07:00
2021-05-14 09:50:46 +02:00
2021-09-08 08:49:00 +02:00
2020-06-04 19:06:24 -07:00
2021-03-30 14:32:03 +02:00
2020-04-27 02:07:40 -04:00
2020-05-09 13:57:12 +02:00
2022-04-08 14:40:03 +02:00
2021-05-19 10:13:00 +02:00
2022-01-16 09:14:22 +01:00