From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795024895; b=MapS7lAM/4QmnWi112LFFfoIyLfZ4NM2omC5afj1uPL6ezmrAyOXm5IEWnH5QZisayAE 48TkhNMzQaSGiE2MdVRVkRzKyud78Nmr6lgFt5NH1LKW5MlBpFT+ARD8E++FRziaYDR+g Izi0BF8fPdGb2BlgedeveslfP1HkKRZ0xOClxKi+Q4N05DAVf1rR5kJYqphUjS9iubAyG CCYvA+nYyoTOVToy1mfP0fOh+/lzg+nfAQphn8nANbULxmo7Juz/zH5llZ0AEG1AoMRlf AMmystDo2YkO1/VYXtcA5PSRM5ohOQidKqRe/0PIZqiyh1vbv8FaNtfJrsG4wgYhELA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795024895; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=dWlnhov4IRcQ0mPOAQ5/Uv5qRtNt8xy2eHttnqIGh8A=; b=enVbbTziaekZPfmNSnfMO91aoyisluyOXYv6u98fnX40pz8IH8xQTJbR+92iDRoLRxr3 ThO44XZRept+NnncyKiXISoknC1jyHEWZF8NXHvA8ZSuuauX9dtVAVzcwm0d/R0SQb/Sm CAvKMDJ6smAA/xuc384iSSoKzSfC4bd+W3x+RNSvQLPSrCyuaKasA8m9xZzM6n4rv9fQ2 woYdYEr3aHqsMbX8nbP1LMpt0dt4Cta1pcHK7ok0XUyV9CQ5Tfvi0Uuynzpv3NBz+yjCx OMAYBNIYUYGU2jvp4YH2woB13NLhGlt1Z0gUGn6yCNORweX+szqCXlIzDGoKEhaoOAg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=OvB6ckM5; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF0EA606A320; Wed, 18 Nov 2026 18:01:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=OvB6ckM5 Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0DEA1F000C4; Wed, 18 Nov 2026 18:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795024895; bh=dWlnhov4IRcQ0mPOAQ5/Uv5qRtNt8xy2eHttnqIGh8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OvB6ckM5ZJaPMclQZyGnKAZwSYpl96aVy1AVlStr7kzZqz5X+W+HfXyqfVr/aqbnH gktA96bGDxnbydwFCFXzvkKrNxXm/RDmyLrvGC+H+icUerxhK/D0grgNlcdEWJFKaU 0ccO/n+uf0sIzboUyO8zYh8vDKKTaVnA+7JQYyVA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mostafa Saleh , Eric Auger , Pranjal Shrivastava , Abdifatah Suruur , Alex Williamson , Sasha Levin Subject: [PATCH 6.18 0887/2151] vfio/platform: prevent read-only region mappings from becoming writable Date: Wed, 18 Nov 2026 15:43:42 +0100 Message-ID: <20261118150154.623058411@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Abdifatah Suruur [ Upstream commit 420bed9131dbbe37abe9d6b32af51219875811e0 ] vfio_platform_mmap() rejects writable mappings of regions without the WRITE flag, but leaves VM_MAYWRITE set. Userspace can map such a region read-only and then upgrade the mapping to writable with mprotect(). Clear VM_MAYWRITE for regions without the WRITE flag, as i915 does for its read-only objects and as fixed in drm/vc4 (CVE-2026-68445), drm/panthor (CVE-2024-53071) and commit a5edadbae57e ("ptp: vmclock: prevent read-only mappings from becoming writable"). Note this is defensive hardening: no in-tree platform driver currently publishes a region without the WRITE flag. The guard costs nothing and keeps the mmap() interface honest if a read-only region ever appears. Fixes: fad4d5b1f042 ("vfio/platform: support MMAP of MMIO regions") Reviewed-by: Mostafa Saleh Reviewed-by: Eric Auger Reviewed-by: Pranjal Shrivastava Signed-off-by: Abdifatah Suruur Link: https://lore.kernel.org/r/20260929094848.7439-2-suruurism@gmail.com Signed-off-by: Alex Williamson Signed-off-by: Sasha Levin --- drivers/vfio/platform/vfio_platform_common.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index 3bf1043cd7957..bd7600c6b9de7 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -595,9 +595,13 @@ int vfio_platform_mmap(struct vfio_device *core_vdev, struct vm_area_struct *vma && (vma->vm_flags & VM_READ)) return -EINVAL; - if (!(vdev->regions[index].flags & VFIO_REGION_INFO_FLAG_WRITE) - && (vma->vm_flags & VM_WRITE)) - return -EINVAL; + /* Prevent read-only region mappings from being upgraded with mprotect() */ + if (!(vdev->regions[index].flags & VFIO_REGION_INFO_FLAG_WRITE)) { + if (vma->vm_flags & VM_WRITE) + return -EINVAL; + + vm_flags_clear(vma, VM_MAYWRITE); + } vma->vm_private_data = vdev; -- 2.53.0