From patchwork Wed Aug 16 18:14:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 714054 Delivered-To: patch@linaro.org Received: by 2002:a5d:4012:0:b0:317:ecd7:513f with SMTP id n18csp2496890wrp; Wed, 16 Aug 2023 11:15:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IECsWfI3SOEF/vGI3QeeFQ5UfHmTfX1dRaiGyyRMTm+IKNdkFjwOs4ZzQfQ1tEvzeNTMzaQ X-Received: by 2002:a05:620a:394c:b0:767:797b:4115 with SMTP id qs12-20020a05620a394c00b00767797b4115mr3028383qkn.60.1692209730555; Wed, 16 Aug 2023 11:15:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692209730; cv=none; d=google.com; s=arc-20160816; b=WtrlroN27DYTzBhWvLzNKN6VUWfoxhcR9RrKR5ZB6Qs0Noy0jvIgftkttIFmTuPOQI 1Z6KFK5f4v4jsmPhmUrCkDB96B6KmsztNMvbVUI8BPT+NJhk/5okPP1+tpHDuHfjzOya xQxJF/RZLntxp0+HtVActn+1Ivdx0rUZxfRrfhKV7WfDNyRkquUjnbUnQN0KNXkP8+Zx rYXiKwXuIIYLnnBvc7Xn3w9VrQCPMa6HDPa1xlKfNcAtGnd3GugLRRpD7k2tRzBDXSuY xZ1jgn7MF4RTbKDuZi/3cXFk8R0tKPIc4BcQyNjDsQcNMo1Vy+dPE2NKjrGO0Bn3y5Ve LKlQ== 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=ALV9YoDASQh3INUMqfrZ/39T3j4UWNqGdyGzg6ZT7es=; fh=1/RPLmiPOKxI3K0Tth0t1XLamI3BfJwfFXnlXaMnevA=; b=WWoyp5Ni3FRRlexzstQAa4HWvPGCSX5Q0IwAP2ujkaf1QPBcOWYb02zaNxoeG7+HjQ QXQdUcU83IJdzE+g8VoUqDn0GFlPjg3XPkVCsXha72tFosVYE7bnajImd+dmNUcddJBw C+Y76XGlprxYmPE1boKK95q55MXMC713SFgeOLmwWJp9XA2UcEx8ANZOZgqR/ObAvAwL 1udSFLU/R0byrSt1IjnD4HW6dIp5uiZLUqBF3C1Sybp1TL4+PrEk4gkQM91qIenBm01B c2DoPOAoZkIMBkJRWSRl/FLBS2lSj5Es/dc6qn5XWaeZXy8QPdUWzc7RepsNeZL3hlsc 9eZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XqGZnj0+; 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 n9-20020a05620a294900b00767cd737259si9544075qkp.251.2023.08.16.11.15.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Aug 2023 11:15:30 -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=XqGZnj0+; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWL2e-0002Ld-Fx; Wed, 16 Aug 2023 14:14:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qWL2c-0002Kx-Vd for qemu-devel@nongnu.org; Wed, 16 Aug 2023 14:14:46 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWL2a-0003gb-JI for qemu-devel@nongnu.org; Wed, 16 Aug 2023 14:14:46 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1bdaeb0f29aso39059465ad.2 for ; Wed, 16 Aug 2023 11:14:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692209682; x=1692814482; 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=ALV9YoDASQh3INUMqfrZ/39T3j4UWNqGdyGzg6ZT7es=; b=XqGZnj0+813xTIZc5J1fYjjgVKDKyL8mEikF6j0n+FswP53tFYFH3HXVSdC4L/YUz2 t6z0AVSm1DMrVqe5bI6woeAU0AkXGDEC35JnvKHQA5j4+D7oisi3BeB2FSAhpihI3EsL bYQnKAjLM1fB7Ln834NwRZ9yCxV6VMC9PtcNnU612hW9arkOd8QfIFAzf+0rXSlgP/IA NFSes4aRwrNG3IFOKV7MGXiSPtto4YvIFnDS4FJaIaQst39tsrrmEUz+8Cr+3W1a1ScU ZQMSyz3f6ySGM+iiaea3wtFZ/vVsVCvLXidzQn3Nhs5DMZvbqTfwN846kfxDZD7tL8a+ 9LMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692209682; x=1692814482; 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=ALV9YoDASQh3INUMqfrZ/39T3j4UWNqGdyGzg6ZT7es=; b=YcHA+FfvSwOd5g/pehCMDdTHsFwPSgp1KRu4cBcP84IuUS8aljusPVWmN/P1gujZmC R6DiVdlry/jxfB7BwEPUgnynsFMmZ/1+48QqTM37BdPrPEk92A/HCpLn5+kiKqV922AB /Wo4TV4o+3NKeV9nW0ilD45Dz3lgDkPfpJzJr/mIa7aXaPn6dAJ+tPdzqs6W8Lt8qAFW yQXhQ5F7d4sC4rebvKkxmHoL5PiWvOjMXxCd+WDWCQqlo/M+nkDGUicolPKKLP42bj0f rb/4jlNSb5zxolh0Lq3HdjDs1Al3p7EoEi9D4khwx9j20LOn0TPfUKffJVby+0fBwqPM kCSA== X-Gm-Message-State: AOJu0YxgfEa8gHygyeib9lZbs7MQ3ZUFsmm6sDtKOvvkCpH6kRSYreFm nj6CrIUZ3FVrw4+Dsmyu/borhRKvUf6F+ElG32U= X-Received: by 2002:a17:902:7e83:b0:1bc:8748:8bbf with SMTP id z3-20020a1709027e8300b001bc87488bbfmr2262512pla.52.1692209682381; Wed, 16 Aug 2023 11:14:42 -0700 (PDT) Received: from stoup.. ([2602:47:d483:7301:a064:e3f9:a812:973b]) by smtp.gmail.com with ESMTPSA id g14-20020a170902868e00b001b9dab0397bsm13423563plo.29.2023.08.16.11.14.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 11:14:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: iii@linux.ibm.com, deller@gmx.de, qemu-stable@nongnu.org Subject: [PATCH 3/6] linux-user: Adjust brk for load_bias Date: Wed, 16 Aug 2023 11:14:34 -0700 Message-Id: <20230816181437.572997-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230816181437.572997-1-richard.henderson@linaro.org> References: <20230816181437.572997-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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 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-bounces+patch=linaro.org@nongnu.org PIE executables are usually linked at offset 0 and are relocated somewhere during load. The hiaddr needs to be adjusted to keep the brk next to the executable. Cc: qemu-stable@nongnu.org Fixes: 1f356e8c013 ("linux-user: Adjust initial brk when interpreter is close to executable") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- linux-user/elfload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index ccfbf82836..ab11f141c3 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -3278,7 +3278,7 @@ static void load_elf_image(const char *image_name, const ImageSource *src, info->start_data = -1; info->end_data = 0; /* Usual start for brk is after all sections of the main executable. */ - info->brk = TARGET_PAGE_ALIGN(hiaddr); + info->brk = TARGET_PAGE_ALIGN(hiaddr + load_bias); info->elf_flags = ehdr->e_flags; prot_exec = PROT_EXEC;