From nobody Wed Nov 19 04:37:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1615023261; cv=none; d=zohomail.com; s=zohoarc; b=CDDXLrkKL+hRohmyMyGXPWtNkf47RbGc5BhaAbAMDl47MXSMGtfUXq2ybW/QKTEAQlSUxHfq2vBe7Uy/fCms/RPLEY3hJVpxlKWTKzciKga0VagEo6ldA/q3Ml0kZpmHg2Kdch9eW+Gd3v0r+VJf9jCaKARMdtSdhcDHIk5Sg1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615023261; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2nkftZPw7wHjP7jh8U/tMxxARHByP0A5sIXfm3o819g=; b=kqZ7m2UnKYZPogpB57DH0r8BwSlZNVYBGJtr0cfuhLoFlBkX705hS1gkRtqRxHJLFbsfSnw/JRyHdS6/n4QAd12MTryb5CK3xfksgni9nUIdXP9SDwnVrz4jY285lSyjPQHuCPQi8pDWgjUIBEJWrTjIVU/FTuJuPH6c965rCIc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615023261775513.7328546799271; Sat, 6 Mar 2021 01:34:21 -0800 (PST) Received: from localhost ([::1]:37962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lITKG-0007C2-F4 for importer@patchew.org; Sat, 06 Mar 2021 04:34:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lITJ7-0006jK-Dz for qemu-devel@nongnu.org; Sat, 06 Mar 2021 04:33:10 -0500 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]:40347) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lITJ3-0007Ny-G1 for qemu-devel@nongnu.org; Sat, 06 Mar 2021 04:33:09 -0500 Received: by mail-lf1-x133.google.com with SMTP id x4so3254451lfu.7 for ; Sat, 06 Mar 2021 01:33:03 -0800 (PST) Received: from titan.localdomain ([193.43.9.4]) by smtp.gmail.com with ESMTPSA id r5sm633024ljh.128.2021.03.06.01.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 01:33:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=2nkftZPw7wHjP7jh8U/tMxxARHByP0A5sIXfm3o819g=; b=XJtAHjIBAescB5UjPTig1M7Gx9iFRG3B7mRAl3O0Echme0aVA1Cgd2mTpkFhvTgwmw XwKUZtxmNwXx02cm69one0wCrT+kGzZ5uNhuNe3gCmQdK3SnwIqD9cRKvCfiwSzVYGfH Xe8stYC/g5ofQo7DTsrWDyelAMkI5WBZSu5URTfRgf5HEwekhQmAWCrvMy1EI70fIZXC 10GJUVvdVuxYJ2tYDxvlDbqg7LBD/bUSmrpWtYUUsmgUiyiQX2vEh63rgQwf8c/ptfrU mfG0XhPTu+fBThZ7jD+iq6E07NFDmmgBzT49XakeHBlNRIsymt+rshnma9Pnb2jyAMbN 21XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=2nkftZPw7wHjP7jh8U/tMxxARHByP0A5sIXfm3o819g=; b=uDbYdgkkvIaVt1QdWrSStf58Y3+MrarUJLYyVJhwESoLIJdiKLTodqhAoJfeU5LBjM YOj/UFZmuCWUxgYzQRKPXWcB2AIpB+SZ0d6r61t5l1s3SgAOYOwlCSde6wE0sohCjaFj fQxyHvs5S4KiwS0MXebnWuxey4LXGw37Xy79qyuExRHkiNfE4FdhrH38uspjhe4PCJ09 6GVP2DYQ2PYjJM9zL8FGm2DtCWiJTw3okZ6455SBKqIRzPZUpsNV2h70q6BEcqVe7QJj Px6bnxfz+ADPUno2m7E99Mk0/VAlAe6yyD+7/8F5lZ2fQ0iD+jGMdZzzN0WDp4IvPn1+ aURw== X-Gm-Message-State: AOAM5315umU5UKKc6ILAUionr0CJB/LLFgwaZ79NMC3ijPQMPpkgzi5U RThbqcYMWNdpJl7LfeIFMSaohflDYJ4= X-Google-Smtp-Source: ABdhPJznIsE8BV8LaCOgkC4xsvFcWCo3TnKJOU9YhCT7MnPh2BJ1dN8DdpvV47yddNrawrPtl15iWw== X-Received: by 2002:a19:ed0e:: with SMTP id y14mr8673178lfy.440.1615023182232; Sat, 06 Mar 2021 01:33:02 -0800 (PST) Date: Sat, 6 Mar 2021 13:33:00 +0400 From: "Ivan A. Melnikov" To: qemu-devel@nongnu.org Subject: [PATCH v2] linux-user: Adjust pgd_find_hole_fallback result with guest_loaddr Message-ID: <20210306093300.ymbogset7fi6p2cr@titan.localdomain> References: <20210303094919.x6wnlh6qulx72fz6@titan.localdomain> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210303094919.x6wnlh6qulx72fz6@titan.localdomain> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::133; envelope-from=ivan.a.melnikov@gmail.com; helo=mail-lf1-x133.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex =?utf-8?Q?Benn=C3=A9e?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" While pgd_find_hole_fallback returns the beginning of the hole found, pgb_find_hole returns guest_base, which is somewhat different as the binary qemu-user is loading usually have non-zero load address. Failing to take that into account leads to random crashes if the hole is "just big enough", but not bigger: in that case, important mappings (e.g. parts of qemu-user itself) may be replaced with the binary we are loading (e.g. guest elf interpreter). Downstream issue (in Russian): https://bugzilla.altlinux.org/39141 Signed-off-by: Ivan A. Melnikov --- linux-user/elfload.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index bab4237e90..58281e00f8 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2259,7 +2259,8 @@ static uintptr_t pgb_find_hole(uintptr_t guest_loaddr= , uintptr_t guest_size, brk =3D (uintptr_t)sbrk(0); =20 if (!maps) { - return pgd_find_hole_fallback(guest_size, brk, align, offset); + ret =3D pgd_find_hole_fallback(guest_size, brk, align, offset); + return (ret =3D=3D (uintptr_t) -1) ? -1 : (ret - guest_loaddr); } =20 /* The first hole is before the first map entry. */ --=20 2.29.2