From patchwork Wed Sep 11 01:53:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Koichiro Den X-Patchwork-Id: 1983592 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X3Ntg5dh3z1y21 for ; Wed, 11 Sep 2024 11:55:07 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1soCZL-0004zq-ED; Wed, 11 Sep 2024 01:54:55 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1soCZJ-0004zO-R0 for kernel-team@lists.ubuntu.com; Wed, 11 Sep 2024 01:54:53 +0000 Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 832DA3F1FC for ; Wed, 11 Sep 2024 01:54:51 +0000 (UTC) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-2d878377fc2so421022a91.0 for ; Tue, 10 Sep 2024 18:54:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726019690; x=1726624490; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C+gEB6fd4klE91/lNo3GA4wRIFC4DSjOnE3LSINMBHw=; b=cR1bMAyr5r8/gpMfG9uYxb24hwLCJN2TAt+cIFLE5nYYNkEE/7wFiQs+qhLf/Cs2dj oBS1o2hdU0FGssj5klnZbPnDOUzbvwx+TxKon41538GCnEyLKuq1KdiJd0jrsReSkgNY 9kxulpANQer1JK0GElrwLuCEEwyUqSe2mUcGfWTj258tPV3VM3Samyb/wKnVbuHh1d8V RKPok0EQPfuH7ZNkPLcFC484/qJ92CGP9EmT97DG8Hr9S5URT9H+Baz3J+wvyedNucE6 49sPYuXtUI9Z/BAAF1XKDmRkkmCp0NdYZqdfMzd7EIqNCNVtFLV/EoSgcO8sAXysspd0 vw2g== X-Gm-Message-State: AOJu0YyR3nkaqerjKnBSR3XPD4rir1IJJnOtNBW7YDx95HpAPDTj5taY 1IBY5rI80ub9n+w8JO9yEESOxnJA3XiMfXQkFIH9ndq+8ZMmBTHvP+ZAF3EEGGqg7uE7W0OyYfG SapTKIf+pgSqjxg8S8VXrByx9hno9oJAynTAwol0HIy+YliHN34kWuxKXqtEp2qqIVCFNLhBKM+ 6sBPACQvMk7w== X-Received: by 2002:a17:90a:2c0f:b0:2d8:73ba:9444 with SMTP id 98e67ed59e1d1-2db671993cemr8414078a91.5.1726019689751; Tue, 10 Sep 2024 18:54:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGK+FF0JtIPiE2h6AjFf2vHEGSua+frW3mcz5R+eccV85pCNbxWg1vd2FRY/IqBRQOfdymk+g== X-Received: by 2002:a17:90a:2c0f:b0:2d8:73ba:9444 with SMTP id 98e67ed59e1d1-2db671993cemr8414040a91.5.1726019689161; Tue, 10 Sep 2024 18:54:49 -0700 (PDT) Received: from localhost.localdomain ([240f:74:7be:1:ac07:f3c7:47f:d867]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2db043c4909sm7068191a91.32.2024.09.10.18.54.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 18:54:48 -0700 (PDT) From: Koichiro Den To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 1/1] ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses Date: Wed, 11 Sep 2024 10:53:55 +0900 Message-ID: <20240911015425.1253171-2-koichiro.den@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240911015425.1253171-1-koichiro.den@canonical.com> References: <20240911015425.1253171-1-koichiro.den@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Yongqiang Liu Since commit a4d5613c4dc6 ("arm: extend pfn_valid to take into account freed memory map alignment") changes the semantics of pfn_valid() to check presence of the memory map for a PFN. A valid page for an address which is reserved but not mapped by the kernel[1], the system crashed during some uio test with the following memory layout: node 0: [mem 0x00000000c0a00000-0x00000000cc8fffff] node 0: [mem 0x00000000d0000000-0x00000000da1fffff] the uio layout is：0xc0900000, 0x100000 the crash backtrace like: Unable to handle kernel paging request at virtual address bff00000 [...] CPU: 1 PID: 465 Comm: startapp.bin Tainted: G O 5.10.0 #1 Hardware name: Generic DT based system PC is at b15_flush_kern_dcache_area+0x24/0x3c LR is at __sync_icache_dcache+0x6c/0x98 [...] (b15_flush_kern_dcache_area) from (__sync_icache_dcache+0x6c/0x98) (__sync_icache_dcache) from (set_pte_at+0x28/0x54) (set_pte_at) from (remap_pfn_range+0x1a0/0x274) (remap_pfn_range) from (uio_mmap+0x184/0x1b8 [uio]) (uio_mmap [uio]) from (__mmap_region+0x264/0x5f4) (__mmap_region) from (__do_mmap_mm+0x3ec/0x440) (__do_mmap_mm) from (do_mmap+0x50/0x58) (do_mmap) from (vm_mmap_pgoff+0xfc/0x188) (vm_mmap_pgoff) from (ksys_mmap_pgoff+0xac/0xc4) (ksys_mmap_pgoff) from (ret_fast_syscall+0x0/0x5c) Code: e0801001 e2423001 e1c00003 f57ff04f (ee070f3e) ---[ end trace 09cf0734c3805d52 ]--- Kernel panic - not syncing: Fatal exception So check if PG_reserved was set to solve this issue. [1]: https://lore.kernel.org/lkml/Zbtdue57RO0QScJM@linux.ibm.com/ Fixes: a4d5613c4dc6 ("arm: extend pfn_valid to take into account freed memory map alignment") Suggested-by: Mike Rapoport Signed-off-by: Yongqiang Liu Signed-off-by: Russell King (Oracle) (backported from commit 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc) [koichiroden: Adjusted context due to missing commits: 8b5989f33337 ("arm: implement the new page table range API") d389a4a81155 ("mm: Add folio flag manipulation functions")] CVE-2024-26947 Signed-off-by: Koichiro Den --- arch/arm/mm/flush.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c index 6d89db7895d1..8ce681d76665 100644 --- a/arch/arm/mm/flush.c +++ b/arch/arm/mm/flush.c @@ -280,6 +280,8 @@ void __sync_icache_dcache(pte_t pteval) return; page = pfn_to_page(pfn); + if (PageReserved(page)) + return; if (cache_is_vipt_aliasing()) mapping = page_mapping_file(page); else