From mboxrd@z Thu Jan 1 00:00:00 1970 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 2A35BC369D9 for ; Wed, 30 Apr 2025 04:27:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C962D8E0002; Wed, 30 Apr 2025 00:27:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C453D8E0001; Wed, 30 Apr 2025 00:27:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ABE2F8E0002; Wed, 30 Apr 2025 00:27:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 840C78E0001 for ; Wed, 30 Apr 2025 00:27:40 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CFDCB1A01F5 for ; Wed, 30 Apr 2025 04:27:39 +0000 (UTC) X-FDA: 83389426638.28.CD47C65 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf10.hostedemail.com (Postfix) with ESMTP id E5870C000D for ; Wed, 30 Apr 2025 04:27:37 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=RJgGwfQo; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of thehajime@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=thehajime@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745987258; a=rsa-sha256; cv=none; b=HejyfctfMQde6TmQTtsqd4sx8hHD9NQ/UhgoSJvp1h5pGPqNprWZIp275QN78JzGj/oBk+ MSCgpsgFeWUWGxtYJKePpNsBntcaxwUYckLL9wmOdQqOI098HAVTSaEQ8QGynk5LmXJTDm TBv4qhbxIsdqA0Hizyi1uw6LApzVtb4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=RJgGwfQo; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of thehajime@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=thehajime@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745987258; 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=ukyNfs65nuvgTdhSkdJYZ2Y9345NLuFCWN/gVQv/aLg=; b=qDij6QeeWVSXymXQOQDVh88ZJBrNOQ/qK4aDv9kP+L5U/9KV3tLTSQNBEcCs59yNqYuTb0 jDIPljOltZSMY4vLxxcnBnCW+7UbQUR6MV93EAJGhlOlUSej0hRP4I0ovsuo3przeGTgMS +uxmDsI2LbND85q9/IJioO9DFyKCsvo= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-736b350a22cso5935731b3a.1 for ; Tue, 29 Apr 2025 21:27:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745987256; x=1746592056; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ukyNfs65nuvgTdhSkdJYZ2Y9345NLuFCWN/gVQv/aLg=; b=RJgGwfQoOrYp3tTudEquRaMhxJyddjzlBPvWV2nT4bf+JlWQi7kaiGCFHU6RDT85gY ZTJDhk0lqOsq5t7qZsjFkI99oG/dP/HM3FbQB4OAYE+TR9L2/L8TlQMAOsURQYEAcOFl h9bbZEK6NLP9f8eBCTZqhZAilYldGuNFwzG69SBNqreANHOYt7PvW6OASflcsPEIMjUR ucylXRKbgzbwknz8DRhasudvttvJg7Rn5U2onZUin7kktazRAHR7qIA+O2/JFetypJmf X0oMEHtjWVnYZ9mwf2wTaMs+I05h9AKd59zFOkdjyt77Dm0n4AbG5lX69IaCEsgHYUYi jO6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745987256; x=1746592056; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ukyNfs65nuvgTdhSkdJYZ2Y9345NLuFCWN/gVQv/aLg=; b=hnO9qWPJiggi0C+ax70HgkBStn499GU4nuP8RiXddqokD72tNVgctwdv5J/7bUTe6D szqxjBosX3Jno/kobtFHMiQyr+45frkObHzbdYdkXnNAlxrYfpC7tDeT4k/HocOxavnZ NKAuP6kF6KP7TtUQPhlP+MgKHpvaDQBelWn3TzY80nk8QxKkOuBHYplRjv1mdhC09SZW cunjNHcpCKiK+cC666xK/4WrcyhSrZBWuYbFmCPAKrRyB9AYguBYbkSFdJdip3WfMc5d fZLN+oS/4a9+aiAdLJc8X7O69UN6Li50/pQPTZPAS6r3/wPSAU2RNczbflJ/PF8GERDe HHpA== X-Forwarded-Encrypted: i=1; AJvYcCX9DmfnByChzxsAAwceojX5Ub5HhSEzKalxxX/zHKwKNI0AFo/M97h45T7jUNL4pCDVv/NSYewBSw==@kvack.org X-Gm-Message-State: AOJu0Yyk3vKMwReVYZVP1nRXEKfPEe0q2caOYeyHhH6h6JVcZHbm1cLc 2ehcEj9xOa6hZisanSkbtTlx3ngYkwimc2GYnBc/kV8TvixFxrY7 X-Gm-Gg: ASbGncvJkaV9dnwuuM4wzfaObEeOw2dSSP2ZM9u63sFjrZ0Vslf+48sGVefndvmwkJ4 rr7yWsAMu623T/g0ssOHAf+nRuce6rr6G4hhSB5zLQrmWhFdyo8ksqT+Jkjy5S7PO5cGJsPwsHt ILeaOoqJLKhb9v4tO1Wi55FnQwvKWMaoPcDYA+w1gJt5OXPUuFcLdijBree7nJwO9HwAUnvfSzH ZEGCHa3vtJN16UhH2zTxb5tTL0U8JCV+mDmZP+37hzC+zZDhgLjbaX7yENXP25IQIp4r/T9LXSe Spq4sn9R6S4lUGX+6LNPFWMto6b6iigTrxaYqp92r30RPyYI487L79wr5ib5phd+ZXqPpYg5CJR YYh1Cn1pKgJU= X-Google-Smtp-Source: AGHT+IHaI2hva/XO5UNyBlcemnxgGJqm96jqA3suKBcAYtlVKSOpmAkCAY78xziMTfLiN3rWee/VXA== X-Received: by 2002:a05:6a00:2e24:b0:736:39d4:ccf6 with SMTP id d2e1a72fcca58-74038989daemr2827463b3a.8.1745987256524; Tue, 29 Apr 2025 21:27:36 -0700 (PDT) Received: from ikb-h07-29-noble.in.iijlab.net ([202.214.97.5]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-740398f9ac3sm621129b3a.23.2025.04.29.21.27.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 21:27:35 -0700 (PDT) Received: by ikb-h07-29-noble.in.iijlab.net (Postfix, from userid 1010) id DC01FE94814; Wed, 30 Apr 2025 13:27:33 +0900 (JST) From: Hajime Tazaki To: linux-um@lists.infradead.org Cc: thehajime@gmail.com, ricarkol@google.com, Liam.Howlett@oracle.com, linux-kernel@vger.kernel.org, Eric Biederman , Kees Cook , Alexander Viro , Christian Brauner , Jan Kara , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v8 01/12] x86/um: nommu: elf loader for fdpic Date: Wed, 30 Apr 2025 13:27:07 +0900 Message-ID: <1f0ec32dbc49f8784995a29a2e87063507eb9838.1745980082.git.thehajime@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: E5870C000D X-Stat-Signature: cm43sh7w8kc4913mxsyq4g4r7na7kinu X-Rspam-User: X-HE-Tag: 1745987257-95188 X-HE-Meta: U2FsdGVkX18XIM4hXkVBqhPBrCi4IAbsBvKFW0gKt4+0HpvoxIhNHX5cLjVRvKjxPDYGNj0jqFxXN7dof9FXTAhNCZjdmtBZ2+sPIKOOU2kh0AsujjHx1lQYvU2YtfpeGtrPPi6mqVZwef6vplZqmK9l39OOclK0g6q+aQ9GAc1KXasXaBXItbxJ+ipYiRz/N111t/eZk+EO3BxhR0X5K5/SGtao1euL+//40sxUlmaPdJneeLQhslnJAmPSGUHWrTv8EPELBYifKC4Pfai1ALQy/z1pNKQuFY8a6Z6pJtrhq4B/RRj/aR09eOhv+xMzLfWwKXk7JIahj1q0UclUhrdaa++zfUMzKWswFyDKYyMwWh6t05b5cbPWD7EeDTmaaKsZgMSYdPpsOXWUQtIyglzzCB3zdWDgql16C2v1N7ZK4iDSmPh2CmePFSYUfwv5WXeeMBD3mvNkGhLmMA/hFMz1SToV8YhroFKjL/uI7CIsNk1bMEv8N4xhX2za70pKUK6mX7PdsKc0gPefnWHWERFx9AT5hLTN62VN02cZ+tenyA25UGW3yK8ywrO7SC3dLIDsY7oPDXAFiCmeaNjo/adqsvAZHRXIyN5zaPc/HV2i2IyDrvVgkU1EFduLvZ5E25eYUg/radVLlR3/lLwtfhfIQzCRWXrmC3r/39CLEcm2Nk5VGGD1zDxrM5nNEWQb2etn+QQrJVuUL1Yyi9wRmHo6DijccC6SOYh0yZCOhzGp6grcY7eU6mnIdujpdGgivkHbWTDXKTupJJ50cps4gJdMXPC5KlYGw0ncpab/6xwYQUDEMedo+Bcje9Di15tyjSrdH7LjV9iZYZ30MKVExIyZNdaZtpv/ce/IJq4XICgXgsdWnWXCdyNQoi/nHrXTFt6+vLhpYuqfeFBebzUzikJp1/TcG2CVqIJgX61AuD4sAb/hPRrvcjYrCrSuOkA0ly1QluSCKSRFuGFB14p ib6S9IDX 0Y/DNZFHqbongtGsxNdZccB/icRWVA//lJ3b6Zf3Qbbl+trfCuaZ5vJPK5sZIQ6o4+15jLnU0/bkipJY/TfA4TFOWwuuoKmoCLvyxyMqjuCoe1SU9LkNFTIMHwztFDQ3GV3Wh551thgFO6WeCEYaJwFOcWESR1o+mAsqKZOQn/L/L+jbEZ0tdU+AatQ5fNe4PZN+ablyMuAtzzolGts62yvtdn1Q1UUZRi25IfHjMFrhKZOOhAhDldT8aDH5CgwXCZSU3L/5JExR5J3kFMCfdvG7iqyfYRknm/PDw341pOhZ8LlR/cBAqxo/qufuMpLDZLVUA+KBW5kHXLdRjUehuWTO+eCrKFEAVAkQlv78R+h6HUmRXt2Ox9pRlcu4O4k4rhO/U1awdWzzqEsLO/S/RF613t5OJgNfvKMBJqufPRx4VPVp3o56TYa+I7zr3/wRhP2Y9eSQWnCNBTMg5zlZl44a+mcl4Ag9s7dMEt6GRhiIriRpj1d4tfRaZ/dntUiHwExGnT+A4ZIxUKeCzS7ztjy36ixSj+W0VucAewajuPfenCm/e3steCQWQOhqiL80yAYnjYbW+tp8Lu+J9l2RAeqOhk6UXnVbUakHP 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: List-Subscribe: List-Unsubscribe: As UML supports CONFIG_MMU=n case, it has to use an alternate ELF loader, FDPIC ELF loader. In this commit, we added necessary definitions in the arch, as UML has not been used so far. It also updates Kconfig file to use BINFMT_ELF_FDPIC under !MMU environment. Cc: Eric Biederman Cc: Kees Cook Cc: Alexander Viro Cc: Christian Brauner Cc: Jan Kara Cc: linux-mm@kvack.org Cc: linux-fsdevel@vger.kernel.org Acked-by: Kees Cook Signed-off-by: Hajime Tazaki Signed-off-by: Ricardo Koller --- arch/um/include/asm/mmu.h | 5 +++++ arch/um/include/asm/ptrace-generic.h | 6 ++++++ arch/x86/um/asm/elf.h | 8 ++++++-- fs/Kconfig.binfmt | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/arch/um/include/asm/mmu.h b/arch/um/include/asm/mmu.h index a3eaca41ff61..01422b761aa0 100644 --- a/arch/um/include/asm/mmu.h +++ b/arch/um/include/asm/mmu.h @@ -14,6 +14,11 @@ typedef struct mm_context { /* Address range in need of a TLB sync */ unsigned long sync_tlb_range_from; unsigned long sync_tlb_range_to; + +#ifdef CONFIG_BINFMT_ELF_FDPIC + unsigned long exec_fdpic_loadmap; + unsigned long interp_fdpic_loadmap; +#endif } mm_context_t; #endif diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h index 4696f24d1492..4ff844bcb1cd 100644 --- a/arch/um/include/asm/ptrace-generic.h +++ b/arch/um/include/asm/ptrace-generic.h @@ -29,6 +29,12 @@ struct pt_regs { #define PTRACE_OLDSETOPTIONS 21 +#ifdef CONFIG_BINFMT_ELF_FDPIC +#define PTRACE_GETFDPIC 31 +#define PTRACE_GETFDPIC_EXEC 0 +#define PTRACE_GETFDPIC_INTERP 1 +#endif + struct task_struct; extern long subarch_ptrace(struct task_struct *child, long request, diff --git a/arch/x86/um/asm/elf.h b/arch/x86/um/asm/elf.h index 62ed5d68a978..33f69f1eac10 100644 --- a/arch/x86/um/asm/elf.h +++ b/arch/x86/um/asm/elf.h @@ -9,6 +9,7 @@ #include #define CORE_DUMP_USE_REGSET +#define ELF_FDPIC_CORE_EFLAGS 0 #ifdef CONFIG_X86_32 @@ -190,8 +191,11 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, extern unsigned long um_vdso_addr; #define AT_SYSINFO_EHDR 33 -#define ARCH_DLINFO NEW_AUX_ENT(AT_SYSINFO_EHDR, um_vdso_addr) - +#define ARCH_DLINFO \ +do { \ + NEW_AUX_ENT(AT_SYSINFO_EHDR, um_vdso_addr); \ + NEW_AUX_ENT(AT_MINSIGSTKSZ, 0); \ +} while (0) #endif typedef unsigned long elf_greg_t; diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index bd2f530e5740..419ba0282806 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt @@ -58,7 +58,7 @@ config ARCH_USE_GNU_PROPERTY config BINFMT_ELF_FDPIC bool "Kernel support for FDPIC ELF binaries" default y if !BINFMT_ELF - depends on ARM || ((M68K || RISCV || SUPERH || XTENSA) && !MMU) + depends on ARM || ((M68K || RISCV || SUPERH || UML || XTENSA) && !MMU) select ELFCORE help ELF FDPIC binaries are based on ELF, but allow the individual load -- 2.43.0