From nobody Mon Apr 29 16:14:21 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1555606034; cv=none; d=zoho.com; s=zohoarc; b=C7xXvONb9t+8aNXnBCz34WxZTSbvNYrJOgj2KqQn4+W74Ro8+fh+w3GglGvY4a4Eg4Fw323p9qL4ktzwsAWVm7Ls8tKtGlIAu4PF1zu1sFa3eiRDuqEIOb37nDxjHAW+qn3hAtuJ/XHuKysyMEP5TxVArl0tfvG/FDbfUCPgrug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555606034; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=IOSzyUnCp7kikxdidSvoyq683jfE6j+woUoO45uv1Hs=; b=P/LuxFt7oR1XtsFmwf1HBIudpDVKVrhfagtfAubk/0201WaoG3NE8CeXGZ2F3p8pDxZkV3oZI3SB5519ljfs97H4ho0lmBVN0UD18MYKtTcBbK/5wnu5u6xUjHlgJGGihZvnLKvE3QC/ideis8TuwFxFGL/WN9VK8QlqxA4itcE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555606034729776.9429324012772; Thu, 18 Apr 2019 09:47:14 -0700 (PDT) Received: from localhost ([127.0.0.1]:44358 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHABe-0004FX-Un for importer@patchew.org; Thu, 18 Apr 2019 12:46:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hH9Bv-000695-DQ for qemu-devel@nongnu.org; Thu, 18 Apr 2019 11:43:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hH9Bu-0003Nu-Ab for qemu-devel@nongnu.org; Thu, 18 Apr 2019 11:43:11 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hH9Bt-0002mS-TS for qemu-devel@nongnu.org; Thu, 18 Apr 2019 11:43:10 -0400 Received: by mail-wr1-x441.google.com with SMTP id h4so3514602wre.7 for ; Thu, 18 Apr 2019 08:43:00 -0700 (PDT) Received: from debian (93-43-183-29.ip93.fastwebnet.it. [93.43.183.29]) by smtp.gmail.com with ESMTPSA id f1sm1540227wrt.87.2019.04.18.08.42.58 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Apr 2019 08:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=IOSzyUnCp7kikxdidSvoyq683jfE6j+woUoO45uv1Hs=; b=pk9++IoHSXm5HwkyTYef8ci7JBaSyN9TuIlMyYKZOOc15xuL94+fLta9eGj1fBgdA+ j771abj2sA+tFX88b2CQate32I3Qj/F5wdfSrAKbH403kvkbNY19qNFkSHYsIMgBG+0R /mLrb8X+jCDHPqTnfSuR9NdbjZi2hUXpJVaPjXHLIG3GykjgCOpuLgCWC/5saXa1q4M+ Ps645CpovOqIhVkpUU98FvKvduNI3PRV07t2SQLkvePKnDBxTP12ebjOw/LPVYMpGATK Od/CoLF02giUe0IghTBbmdxOTUlR67CxkVlFvqqf1HLbAYdmTuId8jzuN0gvv4TKERuY SpiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=IOSzyUnCp7kikxdidSvoyq683jfE6j+woUoO45uv1Hs=; b=oBaHfaf6riJSohMJIuCmt6xHh+1sBC9nMqRU5lmQj/h9oa4DG4FrNId7SmDQudKeNB OGTl2D8Ssyqa5b7DqtmiQwmiMigF3R4/F1uXg/O9ek2q3lp+F2m5+z5gDWNv4I1m2I8V 6ZDNrLI7uUHE4EN3TMJq4+IpufMeBLsEwSqSaIqWJZC2y1fnxb6ZiyhGv8aUNmVZUrui iozC2j11X/1MDn9/h2+4ft9CtvA93OasIVcAa/orQu9Basfx44m2E0CTgZ8No8FXduLa KWeYQ9PpmX2LZ85dPtrh/6FCSwlR9U+Kp6kAtfxc+Rmipu+KVgVn3NLtTgW58LOzLAb4 AC2w== X-Gm-Message-State: APjAAAW9Cczgfsm6b0GirAAVx3J2btkM6hvk/RgJnbXkbDFiRYSRxu+z 9eIgw6M/mh/WxrTqlRgzDuQ= X-Google-Smtp-Source: APXvYqwyjWXIqGNiFPYSV1px9G8nmtcyheAZS6+6PiUGzCnQoZvYuPwuyxPfhUa8TXgIovgFKsEF0w== X-Received: by 2002:adf:eb02:: with SMTP id s2mr66623207wrn.29.1555602179702; Thu, 18 Apr 2019 08:42:59 -0700 (PDT) Date: Thu, 18 Apr 2019 17:42:55 +0200 From: Giuseppe Musacchio To: Riku Voipio Message-ID: <20190418153631.rl3lgadzrqqof72p@debian> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20180716 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 X-Mailman-Approved-At: Thu, 18 Apr 2019 12:45:54 -0400 Subject: [Qemu-devel] [PATCH] linux-user: elf: Map empty PT_LOAD sections X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , qemu-devel@nongnu.org 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" Some PT_LOAD sections may be completely zeroed out and their p_filesize is zero, in that case the loader should just allocate a page that's at least p_memsz bytes large (plus eventual alignment padding). Calling zero_bss does this job for us, all we have to do is make sure we don't try to mmap a zero-length page. Signed-off-by: Giuseppe Musacchio Reviewed-by: Peter Maydell --- linux-user/elfload.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index c1a2602..e9a0951 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2366,11 +2366,17 @@ static void load_elf_image(const char *image_name, = int image_fd, vaddr_ps =3D TARGET_ELF_PAGESTART(vaddr); vaddr_len =3D TARGET_ELF_PAGELENGTH(eppnt->p_filesz + vaddr_po= ); =20 - error =3D target_mmap(vaddr_ps, vaddr_len, - elf_prot, MAP_PRIVATE | MAP_FIXED, - image_fd, eppnt->p_offset - vaddr_po); - if (error =3D=3D -1) { - goto exit_perror; + /* Some sections may be completely empty without any backing f= ile + * segment, in that case just let zero_bss allocate an empty b= uffer + * for it. */ + if (eppnt->p_filesz !=3D 0) { + error =3D target_mmap(vaddr_ps, vaddr_len, elf_prot, + MAP_PRIVATE | MAP_FIXED, + image_fd, eppnt->p_offset - vaddr_po); + + if (error =3D=3D -1) { + goto exit_perror; + } } =20 vaddr_ef =3D vaddr + eppnt->p_filesz; --=20 2.20.1