From patchwork Mon Feb 17 02:49:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13977020 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2EA5C021AB for ; Mon, 17 Feb 2025 02:49:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 095AB6B00B5; Sun, 16 Feb 2025 21:49:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 046086B00D2; Sun, 16 Feb 2025 21:49:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E4EEE280007; Sun, 16 Feb 2025 21:49:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id C81466B00D1 for ; Sun, 16 Feb 2025 21:49:44 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 39181A163A for ; Mon, 17 Feb 2025 02:49:44 +0000 (UTC) X-FDA: 83127906288.29.CABC92A Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf26.hostedemail.com (Postfix) with ESMTP id 2D0C3140002 for ; Mon, 17 Feb 2025 02:49:39 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=I9ZQkcCN; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf26.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739760582; a=rsa-sha256; cv=none; b=YU9hU9/T1JqjrDDyC5uyfTQFufsbT/oUopHToMvxZKuiRv+Gi5tET5nGEju7A12HsCsc7F E2prem0FtOYZOPk7QlkD23ZJTY+d4O8CSEY5Ia0EYIYEAAayT1JRFqACIle/Tx49mMFJDy FGxjh/HaZxcHAIdmqQg0dCOxeh4l+Og= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=I9ZQkcCN; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf26.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739760582; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=pyusY8LOZ2yGcku6OPIUO2n+8tkrExwGCuVjXg24M28=; b=pSF6aWd12nJo2HNr+XB/7P4to9qaaTXKHIDmZHd3ycGlF+u7zoV++CGjYXreQIZxMsBZ76 7Ne3XKjDYm5CiYC8tnVgfrKWnkcvKKvRBpxx5xMDmY6k4Skx4xzgeiROfHX75LjfeIcLyD KUb1hIxMhVvK6qfOqVIfkHYJGE/+Bws= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2211acda7f6so16988825ad.3 for ; Sun, 16 Feb 2025 18:49:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1739760579; x=1740365379; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pyusY8LOZ2yGcku6OPIUO2n+8tkrExwGCuVjXg24M28=; b=I9ZQkcCNQXxWd3tS52SiLrm7jYp4Ad43H6BhlMhh9/G11r75yjG/cAHHcgcpW41lRA qHuqh+XOzjuu/mLUWhSlLTP/4vjGFIQAzNRVF+CREXW4amfm+Bk1Ahznj/1hdTalyY9l aLBLvzsfSGhldZrnQUTzsYGRk/h+z5Fw1lxVbxFbDnHKg7m2ffb1M8zeUZze9tkzwSgZ fUe9tHQ9d7uvjhuRY5OtfTzGmCMZkAryZE6ln0n1tvpHbkopX584gTMNii7V9jUr021W a803tgxS0VFAhqGB4lMPdHuzMRdsctGBMrB/0yqrwvrTYCXaqx9Jcw+GOn6NFI+sA1iq X3Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739760579; x=1740365379; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pyusY8LOZ2yGcku6OPIUO2n+8tkrExwGCuVjXg24M28=; b=bpTXSYsyo9t8Q0a/YQv0ItgcDwRe5C+pY6JlwSO54IMS6dtWs05x32neMd9l7RM+oL p2RRiTp8dkQDJj1ZB3etPcH2J504enILLt4M/1oJCeVvghiWLWcgZhinRrT4wih6hsNp cwRitFszoCtFSWO2mD3aLn0ZlFjRRsVKj2Zx9bE0qhE547DdL9yd6C2YpgLNjxh24eYf QeDcxDSqpasaTWZjhqX6gfbHXflcPLpNfpaaXwEs4LPAS3xZxZPbg9vaE6K5HMEQRt0w IQk+OGTxY6FXMolWZikBbapM9jZNAc1+84u79+ybkS/IV0/hRJNDne5cSIz65JZ8OPpw EugQ== X-Forwarded-Encrypted: i=1; AJvYcCXfN1HEIOc4XiADSj41LUCV1LfS5DiSFielBCjtyTZnX0jB3VkHgtrcyIONwalsOUUGq+sazKQMGQ==@kvack.org X-Gm-Message-State: AOJu0YzOWSppKFMra1pKa/TAfqwmPwFQ7kZzBu8JyHnsG8F3pogAI5yA xPyUA7jpygurbFfjP3wcA0bgp1ahVFGK8WL2CMvH39D6SgfXUHB3n0zEr6meNsQ= X-Gm-Gg: ASbGncvqULCMBL6L6vj/z0ke4jxNzKSMEqmXbmolM/EOHfGPOYt8fzr1l1Kfd2JTPY4 UUhhz8PEbyE5sdZfuWdiXbPw3tMzdm213kM1K62xfs3YEQfzz9fv/P1JupjZrcTcS1HmI+N5lPn HhciM7cxJNsTzYK0xojYLr/0S4c7bVJD38fO6mT8KI0TwgEnvgDjc+u2gq132wmR8Xdk91ZKbGa 9EGKDPTCqzap3EPoH2Q7/Srk4Ij9C3blL/wF93c3zZWBgOKiVCOI6jJMtoAKjW5b978eKff1Rb7 lCJQX4W7sep+6n+dGFi3tmaW17CoWZdZH9jWyn8XrWUd3eZwtc/LLEI= X-Google-Smtp-Source: AGHT+IFciXt96/01ZBgsdmjwKLN9qYlNk8Q0caweyaAHGXTWtcDu/3P5N7kTsRChFbonsJzIjM6PrA== X-Received: by 2002:a17:902:d58b:b0:21f:7821:55b0 with SMTP id d9443c01a7336-22103f064b5mr135755745ad.14.1739760578735; Sun, 16 Feb 2025 18:49:38 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([63.216.146.179]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d545d000sm61823135ad.111.2025.02.16.18.49.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2025 18:49:38 -0800 (PST) From: Qi Zheng To: linux@armlinux.org.uk, ezra@easyb.ch, david@redhat.com, hughd@google.com, ryan.roberts@arm.com, akpm@linux-foundation.org, muchun.song@linux.dev Cc: linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng , Ezra Buehler , stable@vger.kernel.org Subject: [PATCH v3] arm: pgtable: fix NULL pointer dereference issue Date: Mon, 17 Feb 2025 10:49:24 +0800 Message-Id: <20250217024924.57996-1-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 2D0C3140002 X-Rspamd-Server: rspam12 X-Stat-Signature: 7wq51kp6qd7b1ueq4q3p148xmqtibcmr X-HE-Tag: 1739760579-947839 X-HE-Meta: U2FsdGVkX1+XB1JqJxKCv/r2vop3D8wMjyb2X7D2M3KP2u/7q4VqW1HrneXSlHdAjP+2qGeK6/3p10CbD9HlW4OHEBcyYSsQsvWf6UewzeHf4n4O70W6hnqKp7bhEbQEoTNm3uRm01YVYq9WKKg+JEuQCS61dJRbY3Ts65Jh45F8pGbd7ZzouvgBTxdUY7fg8egYNVT+iywRJYmlk2GqNqy2jRh+wP80NLOAUiBoUaePodPA4yEdrhivVEqQR7QRKtXUlW7vbJye4diO72+886FSGIRVAFN/qCkHZxMXr7kRgZvGfPXFRXglfu5EzhYXXHcQbqgKdQXFzcTrRaiXO67aVPo2EF7sk/KUiBQbpKUCkfa0MddWbMjs27e+iIMW/msAzkQLErRTltHSYXnkOQeTo1o67VvJKvqNyOpQDOSIWhDyHphPAweBVtNHLazgDJGzSjLkToo3ub6zAJu+6hJHQ+ogfG5uhbKEG+Yrdu9NFuGnEyPy4n/T2+GsOFA6KZqjcradj0PvLxYbyp4bOqzeP772jSb4e2vrgTELrV/ov85dQ4/S4fga1+LSrM6XE+bqf2jNXPLfqYMrQakRXqb9jKlwZblZvP4mfl+/vRyruhh16Thk/zgkr72Z9tNhA0uYKOKWFD/kkWdM4Vu8ed1pCGv/WmOLw5O9IwkUwc54tNx3naSgDbcxDo8UObTOwYHDQnAg/L7ol2kKoK4dV/YtyXo0bEAqYDihW9DI5O/kTrHRVotUAFzX3kI6vXjwyoN+LheWtRXpXG33UU/gCNyqO1wovUeoBVbA3jrJkUD+NoiiKKrF3kjsajM4Mxs5cwUpQak7V/Ndn9iRopeTqskL4lBVlmorqn9rfoK6dLQMrA1++Rd5mK5dGoT7jL2Nzr2wqgArRozYZ51uYKh2D3LfrYz1cS22W2IdM2ApLldscxMGPBjzWCnkaJs3lazzsj6BOLS9CHBa2rwxNBd fC9pmKht ieQmAC1EqgGfyCH/DEcLOxKWYYzOavomDB83uSzYCgeSpqydI8YUAyyzZYgSBcwVlJyLx5We0Te6ArQcrb/nF6FkfWsRT6ym203SVgMyCjb4rQ/7UVolT/WbI6KDyYAlVndIZCUhTseAe0n5jyKblgxWstJphe4HW0uVpwn0T7g4snFTTTzoub7EAePjz4kKGcFHTyQ84mo9V71Sm3fFRaCnmc75bngwKQrlzBfoU0crsc7rMOQkML2+C9gTlhArfjxA/SsbCJtFr5rER2PqeMPsgqe++XktNkNIIgjSXkOY4eHj4GtHGgUwiK8FMW4J1pWRuXFfJTnY8QeqQ19wF58RDV7jjW/HM41tKjIgIgRrradvlzabVqdun/dFQVyT7ZpM4+q6l+susaghut9ftE8lvQb7uBI6g0p9iv6kdefm4nBjCz4gzy/fOlg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: When update_mmu_cache_range() is called by update_mmu_cache(), the vmf parameter is NULL, which will cause a NULL pointer dereference issue in adjust_pte(): Unable to handle kernel NULL pointer dereference at virtual address 00000030 when read Hardware name: Atmel AT91SAM9 PC is at update_mmu_cache_range+0x1e0/0x278 LR is at pte_offset_map_rw_nolock+0x18/0x2c Call trace: update_mmu_cache_range from remove_migration_pte+0x29c/0x2ec remove_migration_pte from rmap_walk_file+0xcc/0x130 rmap_walk_file from remove_migration_ptes+0x90/0xa4 remove_migration_ptes from migrate_pages_batch+0x6d4/0x858 migrate_pages_batch from migrate_pages+0x188/0x488 migrate_pages from compact_zone+0x56c/0x954 compact_zone from compact_node+0x90/0xf0 compact_node from kcompactd+0x1d4/0x204 kcompactd from kthread+0x120/0x12c kthread from ret_from_fork+0x14/0x38 Exception stack(0xc0d8bfb0 to 0xc0d8bff8) To fix it, do not rely on whether 'ptl' is equal to decide whether to hold the pte lock, but decide it by whether CONFIG_SPLIT_PTE_PTLOCKS is enabled. In addition, if two vmas map to the same PTE page, there is no need to hold the pte lock again, otherwise a deadlock will occur. Just add the need_lock parameter to let adjust_pte() know this information. Reported-by: Ezra Buehler Closes: https://lore.kernel.org/lkml/CAM1KZSmZ2T_riHvay+7cKEFxoPgeVpHkVFTzVVEQ1BO0cLkHEQ@mail.gmail.com/ Fixes: fc9c45b71f43 ("arm: adjust_pte() use pte_offset_map_rw_nolock()") Cc: stable@vger.kernel.org Signed-off-by: Qi Zheng Acked-by: David Hildenbrand Tested-by: Ezra Buehler --- Changes in v3: - move pmd_start_addr and pmd_end_addr to the top and initialize directly (David Hildenbrand) - collect an Acked-by Changes in v2: - change Ezra's email address (Ezra Buehler) - some cleanups (David Hildenbrand) arch/arm/mm/fault-armv.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c index 2bec87c3327d2..39fd5df733178 100644 --- a/arch/arm/mm/fault-armv.c +++ b/arch/arm/mm/fault-armv.c @@ -62,7 +62,7 @@ static int do_adjust_pte(struct vm_area_struct *vma, unsigned long address, } static int adjust_pte(struct vm_area_struct *vma, unsigned long address, - unsigned long pfn, struct vm_fault *vmf) + unsigned long pfn, bool need_lock) { spinlock_t *ptl; pgd_t *pgd; @@ -99,12 +99,11 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address, if (!pte) return 0; - /* - * If we are using split PTE locks, then we need to take the page - * lock here. Otherwise we are using shared mm->page_table_lock - * which is already locked, thus cannot take it. - */ - if (ptl != vmf->ptl) { + if (need_lock) { + /* + * Use nested version here to indicate that we are already + * holding one similar spinlock. + */ spin_lock_nested(ptl, SINGLE_DEPTH_NESTING); if (unlikely(!pmd_same(pmdval, pmdp_get_lockless(pmd)))) { pte_unmap_unlock(pte, ptl); @@ -114,7 +113,7 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address, ret = do_adjust_pte(vma, address, pfn, pte); - if (ptl != vmf->ptl) + if (need_lock) spin_unlock(ptl); pte_unmap(pte); @@ -123,9 +122,10 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address, static void make_coherent(struct address_space *mapping, struct vm_area_struct *vma, - unsigned long addr, pte_t *ptep, unsigned long pfn, - struct vm_fault *vmf) + unsigned long addr, pte_t *ptep, unsigned long pfn) { + const unsigned long pmd_start_addr = ALIGN_DOWN(addr, PMD_SIZE); + const unsigned long pmd_end_addr = pmd_start_addr + PMD_SIZE; struct mm_struct *mm = vma->vm_mm; struct vm_area_struct *mpnt; unsigned long offset; @@ -141,6 +141,14 @@ make_coherent(struct address_space *mapping, struct vm_area_struct *vma, */ flush_dcache_mmap_lock(mapping); vma_interval_tree_foreach(mpnt, &mapping->i_mmap, pgoff, pgoff) { + /* + * If we are using split PTE locks, then we need to take the pte + * lock. Otherwise we are using shared mm->page_table_lock which + * is already locked, thus cannot take it. + */ + bool need_lock = IS_ENABLED(CONFIG_SPLIT_PTE_PTLOCKS); + unsigned long mpnt_addr; + /* * If this VMA is not in our MM, we can ignore it. * Note that we intentionally mask out the VMA @@ -151,7 +159,12 @@ make_coherent(struct address_space *mapping, struct vm_area_struct *vma, if (!(mpnt->vm_flags & VM_MAYSHARE)) continue; offset = (pgoff - mpnt->vm_pgoff) << PAGE_SHIFT; - aliases += adjust_pte(mpnt, mpnt->vm_start + offset, pfn, vmf); + mpnt_addr = mpnt->vm_start + offset; + + /* Avoid deadlocks by not grabbing the same PTE lock again. */ + if (mpnt_addr >= pmd_start_addr && mpnt_addr < pmd_end_addr) + need_lock = false; + aliases += adjust_pte(mpnt, mpnt_addr, pfn, need_lock); } flush_dcache_mmap_unlock(mapping); if (aliases) @@ -194,7 +207,7 @@ void update_mmu_cache_range(struct vm_fault *vmf, struct vm_area_struct *vma, __flush_dcache_folio(mapping, folio); if (mapping) { if (cache_is_vivt()) - make_coherent(mapping, vma, addr, ptep, pfn, vmf); + make_coherent(mapping, vma, addr, ptep, pfn); else if (vma->vm_flags & VM_EXEC) __flush_icache_all(); }