From patchwork Tue Feb 28 13:51:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Ungerer X-Patchwork-Id: 13154927 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E26BAC64EC7 for ; Tue, 28 Feb 2023 13:52:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7212B6B007B; Tue, 28 Feb 2023 08:52:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D27B6B007D; Tue, 28 Feb 2023 08:52:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C1276B007E; Tue, 28 Feb 2023 08:52:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4E84D6B007B for ; Tue, 28 Feb 2023 08:52:44 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 25E56120862 for ; Tue, 28 Feb 2023 13:52:44 +0000 (UTC) X-FDA: 80516841048.26.3F0C6C3 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf06.hostedemail.com (Postfix) with ESMTP id 5A19C18000F for ; Tue, 28 Feb 2023 13:52:42 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UIA1PW7z; spf=pass (imf06.hostedemail.com: domain of gerg@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gerg@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677592362; a=rsa-sha256; cv=none; b=Xec7vBhMP9NDagsmLnS5Z7DufSKbu+6W4ixh4Ty1PlJm52am8+8uCqAGSEeelc0ohY5NdD WJnLyshTcXHxrTtxkb1VOGQ2+qa2276QHDpx7IjgdNLqxQTHWUq8zk5Oe8DNySmhIZzd0C Ibe11VQqZZvc3BHb4Hm6dFY0qqexbRA= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UIA1PW7z; spf=pass (imf06.hostedemail.com: domain of gerg@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gerg@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677592362; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lxtdlK/TlN3uVcOlzgqqiP6ii8i6sDaYmfglqMoXzvw=; b=iMQiS85MJCZxT1FgiF2HXxdv7j5YVvGnst63t2Gl1vmKN321/vOvzE8lZO37DXrr8kRlVD VZs3BzFYR4b9UVwE/P6Fl99R95EGPXK3Btb4fsBhbHcJ9uYjBBW6l6T7pPQNXiY1D1yHVr VhMRERGJK1F72z99XdgsxsFQ/KYJLSU= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7DC3961009; Tue, 28 Feb 2023 13:52:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9511C433EF; Tue, 28 Feb 2023 13:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677592360; bh=38kfVv0+EiOAjlOlOCBBSeSgUje7psw6l+cniGuf0lg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UIA1PW7zhKYyXR1Mph54j3KqknZw1aX5tyz7WWquTK6eYzWytS0HsjV1piSPdY99U Pg/yjx3Mvo22nVan2dpvlFtcrpk3xae9/lKjQyWvcWatWOV8b+2/Vb1qSn2zCpbTok fIL39dMC3Sv+RF6yINq+hqmN6iJSnuYYc7Obh+Ug4Y8OOjKiKWZa8x5IEubzMm/Gzk CYUCjpoK5QQbzWo3CTSwq5NpjPT3DIezt0T++0T8bO2lfOIWSQEGKsicIrxqyC0Tkt vNo6V+8TdrJoEGUtI4QQZKtPc62KrJZMEgCCgHdSfyfPedo0o88SbAlo0LzaVcs/T2 wRDKxRp3AWj9A== From: Greg Ungerer To: linux-riscv@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Greg Ungerer Subject: [PATCH 1/2] binfmt_elf_fdpic: support 64-bit systems Date: Tue, 28 Feb 2023 23:51:25 +1000 Message-Id: <20230228135126.1686427-2-gerg@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230228135126.1686427-1-gerg@kernel.org> References: <20230228135126.1686427-1-gerg@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 5A19C18000F X-Rspamd-Server: rspam01 X-Stat-Signature: dip9x4p8c1qy5i8ekuy4npwco14x6saj X-HE-Tag: 1677592362-101564 X-HE-Meta: U2FsdGVkX19R3Kc4u8l40sZgAARO59XgE3ywzYwTJ9ks9VS6zlj9LGv4jlo7OPR0+trW+lEi/6sGEqnpW8MXCc0e4KkjGaD/jxoX1j5JWxFpBEtpexR2sMAUlmlTAx1YsN6+ntjjjnIF0YIJyRmb5KUDecdxvf/1Wfs+2vLwUpv0dP3kyASieyOZ9s7Y2OfSXhMUEb3ZdL4jBpcYESpkuZyfvK+ilknwPeVe7iuAGSMXPeVEWJ4oGVKp6GSLmR0fiI5BHdRW8iuuzqPWaBL/71zLwJa4kJ3cr6ORcPRFEhggnoAfBVuMhiXYEPT6dPbkczjA8nxBTmmEFQMkf64Sd1LpzoxqSTJoJhcPQI1rH47RtwNpi92STjwZcloIm2OL5nuENh84fmWrjFs6bVcfKWHpw3WzQIj6PE5dmUZLtYOA4Y+gCVuvorMOBdfvpkvZlmQwXMHD/5kwFd7DwMeefkVNIfOK0V+rp7ubBQjuwDSybb2sbypEMkCl+Yt9AJCy3zQKy56m8rY/Zj2VYRoiAocNacjtmsnISW4AoLFF+CQpddf9pKMYjx9Vc7eH/7ZhudtYDKbF6E+IDF3AhhAv4sJLv1eSb9y/bhE3SHz8HjguQ4Dq8863MS10R4EoR6w9k/8I0xlw4Uaxt5u5CpDzoALb7cj+EGfFqQ/NrbV9PGQ7sQnd4S7y/j31htVPQXYRyqhfCfgNmZA+Ejc3xOSOPBhientruyOmHYBSLIOxbbmy1CMht9eEae4R1Il2JdHKrcuxVvirgZRbzspKT6hWxkgoO4Hg/fdwCJf/OavhnnQEeXod2+JwRtfNlywAYndb6LFkQMxlKFfLpIsLkP0mC5XMEBMePbt382L81/AxRlvn3kYRIprktENMqkkjRV5YmhNRZeUOrcmG8OXRRtctyqaFnd754lPUsq44tj6+Kx77EK7TACxpg/BeLDsIrXdjh8jRy71CoR4FHvEm5lN vROsxxwK LnNzP7ceJoxWksPY1RWkgz/F7NSDoa2H+SjwbitWHrLwkaCx2y+xrW9tFJ3R0RTL5O6exui7HN49OiUdxepThJFgbpQyL6Y2/jw2DXTTeXuKv18UcMQTzvokoqo0Tke3uGVpu0Z8LyJiB4DLuT2VISctsiVHGQhu8SyXy7FfL+ZulHDnP4QHYNd6KHojNLli4iqjaX52xCyFPkHSUNJ9BgQ1gV6t5U2t53VR0EIPb+fcvP519+uQYqDXFXc5dAlMmBIvNpmhfAryaif4Z78ja/8prDXI1XbEwhWQjTw7M5yDrruubjpq7khO5zSnqXyrJ0TJnBFb7QkFZu+C1peMFvDS885yfaXz4PRhC9PNzlUnKdewNT5Yo0kitJkJKtQqtTLNQBXVKYX373y6WbEoUL2/x9A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The binfmt_flat_fdpic code has a number of 32-bit specific data structures associated with it. Extend it to be able to support and be used on 64-bit systems as well. The new code defines a number of key 64-bit variants of the core elf-fdpic data structures - along side the existing 32-bit sized ones. A common set of generic named structures are defined to be either the 32-bit or 64-bit ones as required at compile time. This is a similar technique to that used in the ELF binfmt loader. For example: elf_fdpic_loadseg is either elf32_fdpic_loadseg or elf64_fdpic_loadseg elf_fdpic_loadmap is either elf32_fdpic_loadmap or elf64_fdpic_loadmap the choice based on ELFCLASS32 or ELFCLASS64. Signed-off-by: Greg Ungerer Acked-by: Palmer Dabbelt --- fs/binfmt_elf_fdpic.c | 38 +++++++++++++++++----------------- include/linux/elf-fdpic.h | 14 ++++++++++++- include/uapi/linux/elf-fdpic.h | 15 ++++++++++++++ 3 files changed, 47 insertions(+), 20 deletions(-) diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index a05eafcacfb27..2eea6dd429fd6 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -138,7 +138,7 @@ static int is_constdisp(struct elfhdr *hdr) static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params, struct file *file) { - struct elf32_phdr *phdr; + struct elf_phdr *phdr; unsigned long size; int retval, loop; loff_t pos = params->hdr.e_phoff; @@ -560,8 +560,8 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, sp &= ~7UL; /* stack the load map(s) */ - len = sizeof(struct elf32_fdpic_loadmap); - len += sizeof(struct elf32_fdpic_loadseg) * exec_params->loadmap->nsegs; + len = sizeof(struct elf_fdpic_loadmap); + len += sizeof(struct elf_fdpic_loadseg) * exec_params->loadmap->nsegs; sp = (sp - len) & ~7UL; exec_params->map_addr = sp; @@ -571,8 +571,8 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, current->mm->context.exec_fdpic_loadmap = (unsigned long) sp; if (interp_params->loadmap) { - len = sizeof(struct elf32_fdpic_loadmap); - len += sizeof(struct elf32_fdpic_loadseg) * + len = sizeof(struct elf_fdpic_loadmap); + len += sizeof(struct elf_fdpic_loadseg) * interp_params->loadmap->nsegs; sp = (sp - len) & ~7UL; interp_params->map_addr = sp; @@ -740,12 +740,12 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params, struct mm_struct *mm, const char *what) { - struct elf32_fdpic_loadmap *loadmap; + struct elf_fdpic_loadmap *loadmap; #ifdef CONFIG_MMU - struct elf32_fdpic_loadseg *mseg; + struct elf_fdpic_loadseg *mseg; #endif - struct elf32_fdpic_loadseg *seg; - struct elf32_phdr *phdr; + struct elf_fdpic_loadseg *seg; + struct elf_phdr *phdr; unsigned long load_addr, stop; unsigned nloads, tmp; size_t size; @@ -767,7 +767,7 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params, params->loadmap = loadmap; - loadmap->version = ELF32_FDPIC_LOADMAP_VERSION; + loadmap->version = ELF_FDPIC_LOADMAP_VERSION; loadmap->nsegs = nloads; load_addr = params->load_addr; @@ -843,8 +843,8 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params, if (phdr->p_vaddr >= seg->p_vaddr && phdr->p_vaddr + phdr->p_memsz <= seg->p_vaddr + seg->p_memsz) { - Elf32_Dyn __user *dyn; - Elf32_Sword d_tag; + Elf_Dyn __user *dyn; + Elf_Sword d_tag; params->dynamic_addr = (phdr->p_vaddr - seg->p_vaddr) + @@ -854,11 +854,11 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params, * one item, and that the last item is a NULL * entry */ if (phdr->p_memsz == 0 || - phdr->p_memsz % sizeof(Elf32_Dyn) != 0) + phdr->p_memsz % sizeof(Elf_Dyn) != 0) goto dynamic_error; - tmp = phdr->p_memsz / sizeof(Elf32_Dyn); - dyn = (Elf32_Dyn __user *)params->dynamic_addr; + tmp = phdr->p_memsz / sizeof(Elf_Dyn); + dyn = (Elf_Dyn __user *)params->dynamic_addr; if (get_user(d_tag, &dyn[tmp - 1].d_tag) || d_tag != 0) goto dynamic_error; @@ -927,8 +927,8 @@ static int elf_fdpic_map_file_constdisp_on_uclinux( struct file *file, struct mm_struct *mm) { - struct elf32_fdpic_loadseg *seg; - struct elf32_phdr *phdr; + struct elf_fdpic_loadseg *seg; + struct elf_phdr *phdr; unsigned long load_addr, base = ULONG_MAX, top = 0, maddr = 0; int loop, ret; @@ -1011,8 +1011,8 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params, struct file *file, struct mm_struct *mm) { - struct elf32_fdpic_loadseg *seg; - struct elf32_phdr *phdr; + struct elf_fdpic_loadseg *seg; + struct elf_phdr *phdr; unsigned long load_addr, delta_vaddr; int loop, dvset; diff --git a/include/linux/elf-fdpic.h b/include/linux/elf-fdpic.h index 3bea95a1af537..e533f45131945 100644 --- a/include/linux/elf-fdpic.h +++ b/include/linux/elf-fdpic.h @@ -10,13 +10,25 @@ #include +#if ELF_CLASS == ELFCLASS32 +#define Elf_Sword Elf32_Sword +#define elf_fdpic_loadseg elf32_fdpic_loadseg +#define elf_fdpic_loadmap elf32_fdpic_loadmap +#define ELF_FDPIC_LOADMAP_VERSION ELF32_FDPIC_LOADMAP_VERSION +#else +#define Elf_Sword Elf64_Sxword +#define elf_fdpic_loadmap elf64_fdpic_loadmap +#define elf_fdpic_loadseg elf64_fdpic_loadseg +#define ELF_FDPIC_LOADMAP_VERSION ELF64_FDPIC_LOADMAP_VERSION +#endif + /* * binfmt binary parameters structure */ struct elf_fdpic_params { struct elfhdr hdr; /* ref copy of ELF header */ struct elf_phdr *phdrs; /* ref copy of PT_PHDR table */ - struct elf32_fdpic_loadmap *loadmap; /* loadmap to be passed to userspace */ + struct elf_fdpic_loadmap *loadmap; /* loadmap to be passed to userspace */ unsigned long elfhdr_addr; /* mapped ELF header user address */ unsigned long ph_addr; /* mapped PT_PHDR user address */ unsigned long map_addr; /* mapped loadmap user address */ diff --git a/include/uapi/linux/elf-fdpic.h b/include/uapi/linux/elf-fdpic.h index 4fcc6cfebe185..ec23f08711292 100644 --- a/include/uapi/linux/elf-fdpic.h +++ b/include/uapi/linux/elf-fdpic.h @@ -32,4 +32,19 @@ struct elf32_fdpic_loadmap { #define ELF32_FDPIC_LOADMAP_VERSION 0x0000 +/* segment mappings for ELF FDPIC libraries/executables/interpreters */ +struct elf64_fdpic_loadseg { + Elf64_Addr addr; /* core address to which mapped */ + Elf64_Addr p_vaddr; /* VMA recorded in file */ + Elf64_Word p_memsz; /* allocation size recorded in file */ +}; + +struct elf64_fdpic_loadmap { + Elf64_Half version; /* version of these structures, just in case... */ + Elf64_Half nsegs; /* number of segments */ + struct elf64_fdpic_loadseg segs[]; +}; + +#define ELF64_FDPIC_LOADMAP_VERSION 0x0000 + #endif /* _UAPI_LINUX_ELF_FDPIC_H */