From nobody Thu Nov 28 10:38:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1692804924; cv=none; d=zohomail.com; s=zohoarc; b=m/74qYV7UPNOdmjEqVC2ShOh4JK3VDrl2qQr6IPCTrl3cxkRnFU3yxS/6qHVP86Gn2q2EfCBCo6/GHaiLwwaySrkRrrHPL7FjGeNlHVsz7TfnowsllZT3mfJbfQ6BnyETpiCUrPOGV2ScqseZYJOzQYPX2r3EIn5hG+JcZQd62o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692804924; h=Content-Transfer-Encoding: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=+avBoJlPY2QA1l0z1rA0IKiYjyv5cmykuGuOlOZllow=; b=JemsQihuifvZOhD42wH96Iz7IL6L6wSEbnU3r05WqfdgmRSCdU44i2ethTrwmZ5h+Pv/IIodQl70jmVX8RiCBIptVqhWPM5aETmN4epdcLv+FrFoSAyIExszdCOvnpMG5KAHUx4eINvG8Nmm//A+APVBW3+2mgKTfG7t8FpYsdU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1692804924148660.6519994839517; Wed, 23 Aug 2023 08:35:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYpsl-00022j-AH; Wed, 23 Aug 2023 11:34:55 -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 1qYpsQ-0001wg-I1 for qemu-devel@nongnu.org; Wed, 23 Aug 2023 11:34:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYpsO-0007zC-Lv for qemu-devel@nongnu.org; Wed, 23 Aug 2023 11:34:34 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-394-3r_YfNurPwWoVIN1UOWSzg-1; Wed, 23 Aug 2023 11:34:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CB1A6853065; Wed, 23 Aug 2023 15:34:27 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.193.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2E351121314; Wed, 23 Aug 2023 15:34:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692804872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+avBoJlPY2QA1l0z1rA0IKiYjyv5cmykuGuOlOZllow=; b=VhA6ObtIVV4hK+mqCHAn+00gZiGjRDJKL1ylJ3akmO01wiha0U76zf4i4jR8D0haSJOJcw tKgD1S+DLw9zFmIT1UceKMsd2/Hy8ZjetNLi2nQ2KmBWuSMv2I9OqQ7QHrKQokwB/39rvQ V7kPrUmTBizCoxZkCMEmLD6l3tsBcMI= X-MC-Unique: 3r_YfNurPwWoVIN1UOWSzg-1 From: David Hildenbrand To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, David Hildenbrand , Paolo Bonzini , Peter Xu , Igor Mammedov , Thiner Logoer , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Stefan Hajnoczi , Elena Ufimtseva , Jagannathan Raman , "Michael S. Tsirkin" , Ani Sinha , Xiao Guangrong , Daniel Henrique Barboza , Greg Kurz , Eric Blake , Markus Armbruster , Eduardo Habkost Subject: [PATCH v3 04/11] softmmu/physmem: Remap with proper protection in qemu_ram_remap() Date: Wed, 23 Aug 2023 17:34:04 +0200 Message-ID: <20230823153412.832081-5-david@redhat.com> In-Reply-To: <20230823153412.832081-1-david@redhat.com> References: <20230823153412.832081-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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=170.10.133.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692804925467100003 Content-Type: text/plain; charset="utf-8" Let's remap with the proper protection that we can derive from RAM_READONLY. Signed-off-by: David Hildenbrand Reviewed-by: Peter Xu Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/physmem.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 6add537b2a..c09eda6303 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -2070,6 +2070,7 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t lengt= h) ram_addr_t offset; int flags; void *area, *vaddr; + int prot; =20 RAMBLOCK_FOREACH(block) { offset =3D addr - block->offset; @@ -2084,13 +2085,14 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t len= gth) flags |=3D block->flags & RAM_SHARED ? MAP_SHARED : MAP_PRIVATE; flags |=3D block->flags & RAM_NORESERVE ? MAP_NORESERVE : = 0; + prot =3D PROT_READ; + prot |=3D block->flags & RAM_READONLY ? 0 : PROT_WRITE; if (block->fd >=3D 0) { - area =3D mmap(vaddr, length, PROT_READ | PROT_WRITE, - flags, block->fd, offset + block->fd_offse= t); + area =3D mmap(vaddr, length, prot, flags, block->fd, + offset + block->fd_offset); } else { flags |=3D MAP_ANONYMOUS; - area =3D mmap(vaddr, length, PROT_READ | PROT_WRITE, - flags, -1, 0); + area =3D mmap(vaddr, length, prot, flags, -1, 0); } if (area !=3D vaddr) { error_report("Could not remap addr: " --=20 2.41.0