From patchwork Wed Dec 13 13:00:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 753518 Delivered-To: patch@linaro.org Received: by 2002:adf:ff85:0:b0:336:3f68:820c with SMTP id j5csp181619wrr; Wed, 13 Dec 2023 05:04:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IGmMvdOVsQSiusT1qQ5jDd2Waje4OCjSJ+9ncZT2jqSRSTB+bSH92tITvVgPrH2GYCzM1hH X-Received: by 2002:a9d:4d83:0:b0:6d9:e48c:f08a with SMTP id u3-20020a9d4d83000000b006d9e48cf08amr7828144otk.11.1702472672838; Wed, 13 Dec 2023 05:04:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702472672; cv=none; d=google.com; s=arc-20160816; b=tmK74hI1SJYyX8b+YIHT1jwT0ebQr5nXgKsOcWhtX87dxZjEgmv6X8d/rg0tA+hWDr GAzVXWl+xyFUXnOHOnHhLRbXjHK3Y72uG7DrijU6XWNvYDfsUC6FES7S7813UuNmn5c8 hpB/peY55Bmkd018k8GkATGDujlNSMA+MbnDLbYJ+Ux96XtroSKamGWAwjTt674WZCm1 zIIvbDaVtnhBP7g9qvyhBXz8IBLgFV7NkOv7IhkYftZV42DsfEPw8bw6Mv21Jm+g4mJ1 IyKTKEDtT4ihDpnLx/k8I9LARfgdjiz27GB+rwuc0C9KQFtA10Cb003tXs2dHfw+6PVi qaUA== 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=KSapHoclk05OMTp0e/WRCGLPZFnJDfbbyExzt0bPku8=; fh=bMaafE1clBtiBaCrlbrbcY1DSEPhhFUklUk4XoVHiPU=; b=Jd8lu+vWN+TfuAAVBCj1idwGGuaJAceMQDiTOPau0HQAgPIbILx3SJUv1+0TgNjIrF ydVoDJjc36JgwQHHBGE6VhuQP7Bstc9ybTTcWQyRTsh6QvI0f12GFUis6KjZB+c6jTe5 CoEaS+qTNBOxVWuj3w3L51VVKz0k/oHtRe5crUXgrkiw2SxpIqCo+cSzdMBEFYPAEfAI AsDfmrFhxGmRq+GyaV9ByyUw7696MdzZjruGMFK3Zp9Qqhsx30WmOyaa1OEpacZSftIG vKxcktbraGfkEUlGrNfzeVoZIJHxZAY6WX+69dPNu4pOeCIH3HLBkDtDPXsehrhKycWy eWiQ== 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 n13-20020a0561020a8d00b004649590ba65si1809422vsg.771.2023.12.13.05.04.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Dec 2023 05:04:32 -0800 (PST) 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 1rDOrr-0008DX-DP; Wed, 13 Dec 2023 08:01:39 -0500 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 1rDOrP-00083v-4O; Wed, 13 Dec 2023 08:01:13 -0500 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 1rDOrM-0006y6-Rr; Wed, 13 Dec 2023 08:01:10 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 0D9783B438; Wed, 13 Dec 2023 16:01:01 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id A88F73C8C9; Wed, 13 Dec 2023 16:00:41 +0300 (MSK) Received: (nullmailer pid 1024708 invoked by uid 1000); Wed, 13 Dec 2023 13:00:41 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Michael Tokarev Subject: [Stable-7.2.8 05/24] linux-user: Fix loaddr computation for some elf files Date: Wed, 13 Dec 2023 16:00:14 +0300 Message-Id: <20231213130041.1024630-5-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, 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-bounces+patch=linaro.org@nongnu.org From: Richard Henderson The file offset of the load segment is not relevant to the low address, only the beginning of the virtual address page. Cc: qemu-stable@nongnu.org Fixes: a93934fecd4 ("elf: take phdr offset into account when calculating the program load address") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1952 Signed-off-by: Richard Henderson Reviewed-by: Michael Tokarev (cherry picked from commit 82d70a84c8ee42ef969a9cfddc0f5b30b16165f5) Signed-off-by: Michael Tokarev diff --git a/linux-user/elfload.c b/linux-user/elfload.c index c2c095d383..87895847ec 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -3001,7 +3001,7 @@ static void load_elf_image(const char *image_name, int image_fd, for (i = 0; i < ehdr->e_phnum; ++i) { struct elf_phdr *eppnt = phdr + i; if (eppnt->p_type == PT_LOAD) { - abi_ulong a = eppnt->p_vaddr - eppnt->p_offset; + abi_ulong a = eppnt->p_vaddr & TARGET_PAGE_MASK; if (a < loaddr) { loaddr = a; }