From:   Christophe Leroy <christophe.leroy@csgroup.eu>
To:     Josh Poimboeuf <jpoimboe@redhat.com>,
        Jiri Kosina <jikos@kernel.org>,
        Miroslav Benes <mbenes@suse.cz>,
        Petr Mladek <pmladek@suse.com>,
        Joe Lawrence <joe.lawrence@redhat.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        Ingo Molnar <mingo@redhat.com>,
        "Naveen N . Rao" <naveen.n.rao@linux.vnet.ibm.com>
CC:     Christophe Leroy <christophe.leroy@csgroup.eu>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
        "live-patching@vger.kernel.org" <live-patching@vger.kernel.org>
Subject: [PATCH v2 01/13] livepatch: Fix build failure on 32 bits processors
Thread-Topic: [PATCH v2 01/13] livepatch: Fix build failure on 32 bits
 processors
Thread-Index: AQHX9b/0+Iw0OmIoxEmsW571E1syqw==
Date:   Mon, 20 Dec 2021 16:38:02 +0000
Message-ID: <5288e11b018a762ea3351cc8fb2d4f15093a4457.1640017960.git.christophe.leroy@csgroup.eu>
References: <cover.1640017960.git.christophe.leroy@csgroup.eu>
In-Reply-To: <cover.1640017960.git.christophe.leroy@csgroup.eu>
Accept-Language: fr-FR, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?uW9xKlSpuRI/Cr6O0WdpKhwRdDjUkportSE6zqyOQMA/Ij+laigZm3UpDJ?=
 =?iso-8859-1?Q?wmzOqYLcGG9joBAJCVxZQ8rJ5KO47/9qx4Yr6d/ZyYEbSpmkfgt3m+rqE4?=
 =?iso-8859-1?Q?/KdcfPKGUMXKhM41y1fwfjUYWHgwQLO5HYViw+hPreJErZFGz73R3tMDUq?=
 =?iso-8859-1?Q?Qr9ASUGpwljqSy59EFvQCA0MzQTpzBO6xAWHEe+Ubnq96rgzfsNWB1PmpH?=
 =?iso-8859-1?Q?BcBaBR6T17AueLtn+xTF7tvXY/mC7fBhkYMox6og1O2ts1RNFobrAL7sSP?=
 =?iso-8859-1?Q?hRi6hIeCp8tXviAdRHdiw6Ib1Yb5eB+tz+U5Kc/x1GOG89WaQpUVKk9gg8?=
 =?iso-8859-1?Q?veMm0Q9YfX6/4Acu7NaIzMx4I2Pp1UrYG8aVjEQNgPvu4Bugdg2hWoPY1Y?=
 =?iso-8859-1?Q?9s5VderCAUusRgpaWJAhPNe1wARHWzXduTbhj2v4V+NSSQNYOPjQQ+lRr6?=
 =?iso-8859-1?Q?ohwKFEKSM7n6yggI5pXgropwLJuCpa2Nh31SF0+wpqjANNyKbwS0QZb96Z?=
 =?iso-8859-1?Q?rksZbybCaWckPH01rZE4MDucYOGW25O9xQvKwJxZ+7LE1IRCdTLBklYdsw?=
 =?iso-8859-1?Q?Srysl2iOAqOKYH+57/JdAccpjXuuLUd/dd+dj+P9dXzcpzNmuoFS9OnCjl?=
 =?iso-8859-1?Q?UNjXtpNiP48BhwOTUxgtIE8ragtiUxm0ZzrZN/MFJML3AvqcfShueVlwkQ?=
 =?iso-8859-1?Q?SUCVbFraH+oIaIZ2dD5BG+8jclUZQaZlyDg6VEVp59OAGkkEca/ZXOrFkj?=
 =?iso-8859-1?Q?Lu9GXQPFD0oi1Kc+bJK8vvgoG1VAiB9hqAGytgXu3vxNRwhJimsZgi+dMn?=
 =?iso-8859-1?Q?5Jlg8QOEZ5fb0sx4j2gRBwZR1e9F9VvgW9WJtWGPjp9TSeOHoDSPLvq3mI?=
 =?iso-8859-1?Q?DemDZk7IysnO0zTk08kU+EzwenL1bToaiUCS4deTrqCKseiK9KSW2W4iMX?=
 =?iso-8859-1?Q?aBeAgxKpM9rZbZShSHcNghWh9spV/vvv9yKtbovzXj2huBYM8VBSLUkST6?=
 =?iso-8859-1?Q?9y2x1loVaIR0JiY7xdZIDY2LD99TimpvcUPdFm+qDpAQr2/ILdjHYPAK67?=
 =?iso-8859-1?Q?+KUZpJzVqr/unlr1AJRPa+2zT09Rgk/nbskgQNDtRDfVSGlwJ3qdJorK4N?=
 =?iso-8859-1?Q?WFyChSq1G0K0xyvLvuWdJkH0B+hj8viJ1kbwz4SkTJcsfg2zI4RLBV9+mt?=
 =?iso-8859-1?Q?OBEFz2qO7zTEDkUytfkmune2Cf2SWvFgerIsYmF7Sy2JUtjW0h9U7620Lx?=
 =?iso-8859-1?Q?5OkDUaFnfo2W0QlmxmK7NwKGUbqrkqSeNHfLjQtgUUowsLzlVp+CPo8M3d?=
 =?iso-8859-1?Q?1VL01phLRnR+RqvSch+N7ZUFBIrrEnPpzjH0SItZmMadbZww1QWwp9tjBF?=
 =?iso-8859-1?Q?Ps39gLZlbUnoqADSkffrYnuKDmgLrJT4DomFvtt/F7NpGpbN8SiLLZCwa0?=
 =?iso-8859-1?Q?gDbRNxublz9o7c+LxctMQ9t6MvsjVR7MgtAEuEnynPp3+EJKHSAT99lUmN?=
 =?iso-8859-1?Q?g0Bnk+SSSG6TZlE8YhoH2G+OjXSiK+xpOoxh1m7QQQ5+8izIxFy8ef3ziR?=
 =?iso-8859-1?Q?VkyPBynwmb5MwxIwdaSC9CcW/u0+F70sYCllYN7gFAov2ZJ37g2w6mSbpb?=
 =?iso-8859-1?Q?i+WeCCdbtlOTKua/9oe4vDrKWZH8Cf3D2pbnuLE3Th3xQEuZ4sCb3dfCY0?=
 =?iso-8859-1?Q?k/cLwaO1CVkBykbzLzldsolODIIV2UdZqAiPlpWEhSJs6dA/Sn733RlvCV?=
 =?iso-8859-1?Q?vyB9DvcQfCxjqdo6oAWKb89rY=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-OriginatorOrg: csgroup.eu
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-Network-Message-Id: 88d957ed-fe96-421e-6758-08d9c3d7171b
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Dec 2021 16:38:02.1755
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: oavxn+I6YELkIYs5lDiiztH/nr4S5sbPte12T52ygDMf1ey5lzJ2Xvtjpy749hLi/YTCjRM4U5deE//YKjQijw1zqxb6A6obvR/J7Wa9cII=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB1905
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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: 7c8e2bdd5f0d ("livepatch: Apply vmlinux-specific KLP relocations early")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: Petr Mladek <pmladek@suse.com>
---
 kernel/livepatch/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index 335d988bd811..c0789383807b 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -190,7 +190,7 @@ static int klp_find_object_symbol(const char *objname, const char *name,
 	return -EINVAL;
 }
 
-static int klp_resolve_symbols(Elf64_Shdr *sechdrs, const char *strtab,
+static int klp_resolve_symbols(Elf_Shdr *sechdrs, const char *strtab,
 			       unsigned int symndx, Elf_Shdr *relasec,
 			       const char *sec_objname)
 {
@@ -218,7 +218,7 @@ static int klp_resolve_symbols(Elf64_Shdr *sechdrs, const char *strtab,
 	relas = (Elf_Rela *) relasec->sh_addr;
 	/* For each rela in this klp relocation section */
 	for (i = 0; i < relasec->sh_size / sizeof(Elf_Rela); i++) {
-		sym = (Elf64_Sym *)sechdrs[symndx].sh_addr + ELF_R_SYM(relas[i].r_info);
+		sym = (Elf_Sym *)sechdrs[symndx].sh_addr + ELF_R_SYM(relas[i].r_info);
 		if (sym->st_shndx != SHN_LIVEPATCH) {
 			pr_err("symbol %s is not marked as a livepatch symbol\n",
 			       strtab + sym->st_name);
-- 
2.33.1