From patchwork Sat Sep 9 10:27:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 721082 Delivered-To: patch@linaro.org Received: by 2002:adf:f64d:0:b0:31d:da82:a3b4 with SMTP id x13csp200460wrp; Sat, 9 Sep 2023 03:29:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFiXHk+rmaoA2raH1oJia07U1IwGAKr8a+zgnUdn25zo7iFa72kCd5Jeo3WOS20zruP5oNJ X-Received: by 2002:a05:622a:20a:b0:412:845:3d94 with SMTP id b10-20020a05622a020a00b0041208453d94mr5448147qtx.54.1694255390345; Sat, 09 Sep 2023 03:29:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694255390; cv=none; d=google.com; s=arc-20160816; b=oBeQErVSoBqt+IlNcrGV54lfYM3dt1VsG5nBAzwoqAVcPNrGmxvuviXRx2kG2OMwxU kHU3cWdLzLQRhjMfZn1UCeE9blDG+ssm3lqfWjhrS/+axXWVAK0uGsZxzPio5pGhcmI/ KWVxTyrCqI/Lb3esusc7vs8+ZUnAXcXIgVHSMXi6VYaWqEnifuapDTCw8kmJ4bwn0wlJ tPHNsPbTC5KUadL5BU4q+UakoNUzZlKc6Z6Wkof6Okm/7MZcfqBszAxVmELjg2XKo/24 SGKtx9074ysSjoI1cGatxNA30sHRKPU0jaqAJ3ckbtgbyJACgtDofKBiOQQHzKKsqJol G76g== 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; bh=4klhxoPJATNkg3ZAt8qVd27UExA7+M3rW61HSxNJBng=; fh=OZJ3+QZPrqj/nL2n5BczvdwTUg+gWEoo3BmH9JbYpKQ=; b=p9abtHzRs6V+am8cqEQ8hauieBRjS4H5jqXMWM9Vgjvc42lvMA0Ldyx7DkpXZNs0fZ Jxp6MumLlruSdBewOTw5tRw5V5ifsqjjepoLDW7XPrJWL0OhJCfO4tLriVTHrb6Bf2Dk 3E7rm3jSAI58aMY8AhcH4PiID1nGTD0CBm6bDJc/Mw3aiWbdWOAcs4mZ72NN+fvPeGiQ Y3ZEYANUF9Z7Lt60d9tfpi1gyTkYQckECcwxhpxXSO1w5LEd0YOWJohTPLFSiHCSwdJ3 i3cr+YGCSs/IRDXuUekQIeJEEoK9p6fhjGn+k/E86aCpLZDi+kky7L8wbjDfLs0sSBl8 6dgQ== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k4-20020ac85fc4000000b0040fd72b982esi2303396qta.780.2023.09.09.03.29.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Sep 2023 03:29:50 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qevCp-0007Rs-Oz; Sat, 09 Sep 2023 06:28:47 -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 1qevCo-0007RX-RA; Sat, 09 Sep 2023 06:28:46 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qevCm-0004Vs-KJ; Sat, 09 Sep 2023 06:28:46 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 130E2204A2; Sat, 9 Sep 2023 13:28:50 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 1245926D00; Sat, 9 Sep 2023 13:27:59 +0300 (MSK) Received: (nullmailer pid 346667 invoked by uid 1000); Sat, 09 Sep 2023 10:27:57 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Helge Deller , Ilya Leoshkevich , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-8.1.1 15/34] linux-user: Adjust brk for load_bias Date: Sat, 9 Sep 2023 13:27:08 +0300 Message-Id: <20230909102747.346522-15-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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 From: Richard Henderson 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") Tested-by: Helge Deller Reviewed-by: Ilya Leoshkevich Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson (cherry picked from commit aec338d63bc28f1f13d5e64c561d7f1dd0e4b07e) Signed-off-by: Michael Tokarev diff --git a/linux-user/elfload.c b/linux-user/elfload.c index ac03beb01b..a69e7d7eab 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -3204,7 +3204,7 @@ static void load_elf_image(const char *image_name, int image_fd, 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;