From patchwork Tue Aug 23 22:05:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 599482 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp2738349mae; Tue, 23 Aug 2022 15:09:30 -0700 (PDT) X-Google-Smtp-Source: AA6agR6wFvM2oxx0gfkSP+5VEvi4F9ToedAqvNW8SwOsrwuEFCEbcMRwTIjSag2egxPuXuJA5jGp X-Received: by 2002:ad4:4eef:0:b0:496:de43:8cc0 with SMTP id dv15-20020ad44eef000000b00496de438cc0mr11116052qvb.26.1661292569911; Tue, 23 Aug 2022 15:09:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661292569; cv=none; d=google.com; s=arc-20160816; b=vqkFWbg+EcU1ENtx1pmJWltBwV/DRMjIk+dgwods3Vu+1PnJwNDkZyjrcaY8dGgFQ1 YWm+7VF/h1h1c/YX/+1pxG4WiKcLGpXcdW4wb8B2bDYyzGFJipfZ12hKAYpQN8hcGaZg O6EuTDd6KEbO5sbyNXs1CjJSCTi30VbDLHzZYHCmUETfh1gj0uoOCR3BY9GO2K3kwmEw 3+EAM5jvzjeubvrudGn49uiNJ+OxgrxMWL5LJxblBmvJRlortNagji7W9xngRklg/SV3 GvcprkRgsMZYirp4vLtKzAXbjxIzTgXB7zGRZC01BolW6rEg9N+bTkzejql7Q4C+PjVQ 9zwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rGKQMWIS6WhWNLXWFYWI0ihkVZKbHQO46kskGqp/pqA=; b=I6oS7zJX1Sp/IQ8H+s0nF/eq/kWK2Bfvm7LQKQxNPBMarh/tV6ZjOn14Tx+M1xvFL/ BNrD+uL9kl2sz551jzckEoCNk+96p62ZFcIDgTs+PNo7TTV2xVO6Oy3jEZ8lYWKy9XNP 7pVfz7fhDpgL+U4MIqtUkgvjV3OEcCDWQu6NfjU59yopIqVBFQPVbE0dlQ55orxfbddA 731ARsHTxrdKyBq6I4YyPA1sN4BslSGLlOfNiT45JkGohQE0XZogGojMF7U7UBe+qKtm uka+MWxeIBx+0gI6b2r1AfpAt0OquRxyAnyXfCG8k3r3fsKpegjVD/DZTMb4ss5DmY6/ hFXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="L1v/vrRQ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id jl12-20020ad45e8c000000b00496b5b2fa83si7313158qvb.22.2022.08.23.15.09.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Aug 2022 15:09:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="L1v/vrRQ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQc5R-0005eL-HG for patch@linaro.org; Tue, 23 Aug 2022 18:09:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQc1w-0008I2-A7 for qemu-devel@nongnu.org; Tue, 23 Aug 2022 18:05:52 -0400 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]:51761) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQc1u-0001Pe-EL for qemu-devel@nongnu.org; Tue, 23 Aug 2022 18:05:51 -0400 Received: by mail-pj1-x1036.google.com with SMTP id e19so14035593pju.1 for ; Tue, 23 Aug 2022 15:05:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=rGKQMWIS6WhWNLXWFYWI0ihkVZKbHQO46kskGqp/pqA=; b=L1v/vrRQ2zmpzQpVts7uzQli8RC+EjhgTTmXHeNR5X1A4Cdr6KZfrtXBfeuwBSkRBT wDJ7WTGT0odA+gm1vf6T4Qc86hmT7wFnw7aNBaKhfIkXyEAgjBc6mwx9luWH1th0Uavw 12gLeKXRDrJAxb7xTvydVBcALUfPuThpKc08xeZTNAMpLFPUS0qdY0/ZTTanGgTK/rTq hHv0Jyewc0/f1zEseGoFfr0jG129ejetUttug4z8Zud7rDUDed/WbvZ5e6qbFd63wGbm Tx/zm09JkqXCYiLnZPGgNVH9pALrtBoiZx5H19GA7CriBsLttu7ulxu2dCBAlN6DDXDO eToQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=rGKQMWIS6WhWNLXWFYWI0ihkVZKbHQO46kskGqp/pqA=; b=NDkwU1QUcAq9qU8wdKoVqFhVNeXGSPxznoVtKG4fuaxHzaZFUm99AhUxWPPDdvp4tn 4+os5DkaLRieu03puaFM5dvIxm8Y+49Ph3Ql0HDPtcbeoX2H74cPhawMqGa+VwbDXow/ WJo+MVQmLFMBvv4/gCDu2Yi66BbkQCq86nUat1Pl1TJuthfwYKt7L/n17xzMfhstN6cG 8gaOyp1nt3qIpQKK2vQEg8SeYgEdWg/hEpccobpce7Ykd0UUSrx9YWWFC0O7d16SgevJ cROi8FkH69TUBXZx1ZGzusqlOpHqgxEGqlTIa7Mtu/HQ6wehjtr3Aeua1PGa3ReJXMr+ CMaA== X-Gm-Message-State: ACgBeo0Zitr0W8nNk3svU87E4sa3o5miXP5s+llkQtnIqi4+nvunev7R QtnS9gzDks/J1OuUPnA2FJsZGnZN3smlrQ== X-Received: by 2002:a17:90b:3e8d:b0:1fa:facf:672f with SMTP id rj13-20020a17090b3e8d00b001fafacf672fmr5252724pjb.0.1661292349656; Tue, 23 Aug 2022 15:05:49 -0700 (PDT) Received: from stoup.. ([2602:47:d49d:ec01:46f9:77b4:ec0a:c2d9]) by smtp.gmail.com with ESMTPSA id n12-20020a170902f60c00b0017292073839sm11020974plg.178.2022.08.23.15.05.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 15:05:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: iii@linux.ibm.com, laurent@vivier.eu, alex.bennee@linaro.org Subject: [PATCH v7 04/20] linux-user: Honor PT_GNU_STACK Date: Tue, 23 Aug 2022 15:05:26 -0700 Message-Id: <20220823220542.1993395-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220823220542.1993395-1-richard.henderson@linaro.org> References: <20220823220542.1993395-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1036; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1036.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Map the stack executable if required by default or on demand. Acked-by: Ilya Leoshkevich Tested-by: Ilya Leoshkevich Signed-off-by: Richard Henderson --- include/elf.h | 1 + linux-user/qemu.h | 1 + linux-user/elfload.c | 19 ++++++++++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/include/elf.h b/include/elf.h index 3a4bcb646a..3d6b9062c0 100644 --- a/include/elf.h +++ b/include/elf.h @@ -31,6 +31,7 @@ typedef int64_t Elf64_Sxword; #define PT_LOPROC 0x70000000 #define PT_HIPROC 0x7fffffff +#define PT_GNU_STACK (PT_LOOS + 0x474e551) #define PT_GNU_PROPERTY (PT_LOOS + 0x474e553) #define PT_MIPS_REGINFO 0x70000000 diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 7d90de1b15..e2e93fbd1d 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -48,6 +48,7 @@ struct image_info { uint32_t elf_flags; int personality; abi_ulong alignment; + bool exec_stack; /* Generic semihosting knows about these pointers. */ abi_ulong arg_strings; /* strings for argv */ diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b20d513929..90375c6b74 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -232,6 +232,7 @@ static bool init_guest_commpage(void) #define ELF_ARCH EM_386 #define ELF_PLATFORM get_elf_platform() +#define EXSTACK_DEFAULT true static const char *get_elf_platform(void) { @@ -308,6 +309,7 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUX86State *en #define ELF_ARCH EM_ARM #define ELF_CLASS ELFCLASS32 +#define EXSTACK_DEFAULT true static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop) @@ -776,6 +778,7 @@ static inline void init_thread(struct target_pt_regs *regs, #else #define ELF_CLASS ELFCLASS32 +#define EXSTACK_DEFAULT true #endif @@ -973,6 +976,7 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUPPCState *en #define ELF_CLASS ELFCLASS64 #define ELF_ARCH EM_LOONGARCH +#define EXSTACK_DEFAULT true #define elf_check_arch(x) ((x) == EM_LOONGARCH) @@ -1068,6 +1072,7 @@ static uint32_t get_elf_hwcap(void) #define ELF_CLASS ELFCLASS32 #endif #define ELF_ARCH EM_MIPS +#define EXSTACK_DEFAULT true #ifdef TARGET_ABI_MIPSN32 #define elf_check_abi(x) ((x) & EF_MIPS_ABI2) @@ -1806,6 +1811,10 @@ static inline void init_thread(struct target_pt_regs *regs, #define bswaptls(ptr) bswap32s(ptr) #endif +#ifndef EXSTACK_DEFAULT +#define EXSTACK_DEFAULT false +#endif + #include "elf.h" /* We must delay the following stanzas until after "elf.h". */ @@ -2081,6 +2090,7 @@ static abi_ulong setup_arg_pages(struct linux_binprm *bprm, struct image_info *info) { abi_ulong size, error, guard; + int prot; size = guest_stack_size; if (size < STACK_LOWER_LIMIT) { @@ -2091,7 +2101,11 @@ static abi_ulong setup_arg_pages(struct linux_binprm *bprm, guard = qemu_real_host_page_size(); } - error = target_mmap(0, size + guard, PROT_READ | PROT_WRITE, + prot = PROT_READ | PROT_WRITE; + if (info->exec_stack) { + prot |= PROT_EXEC; + } + error = target_mmap(0, size + guard, prot, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (error == -1) { perror("mmap stack"); @@ -2921,6 +2935,7 @@ static void load_elf_image(const char *image_name, int image_fd, */ loaddr = -1, hiaddr = 0; info->alignment = 0; + info->exec_stack = EXSTACK_DEFAULT; for (i = 0; i < ehdr->e_phnum; ++i) { struct elf_phdr *eppnt = phdr + i; if (eppnt->p_type == PT_LOAD) { @@ -2963,6 +2978,8 @@ static void load_elf_image(const char *image_name, int image_fd, if (!parse_elf_properties(image_fd, info, eppnt, bprm_buf, &err)) { goto exit_errmsg; } + } else if (eppnt->p_type == PT_GNU_STACK) { + info->exec_stack = eppnt->p_flags & PF_X; } }