From patchwork Fri Feb 14 03:03:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13974411 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 398BFC021A0 for ; Fri, 14 Feb 2025 03:05:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C38686B0085; Thu, 13 Feb 2025 22:05:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BE8576B0088; Thu, 13 Feb 2025 22:05:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AAFF56B0089; Thu, 13 Feb 2025 22:05:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8E18C6B0085 for ; Thu, 13 Feb 2025 22:05:38 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 1B3BA1A1BD0 for ; Fri, 14 Feb 2025 03:05:38 +0000 (UTC) X-FDA: 83117059956.27.B0563F0 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf18.hostedemail.com (Postfix) with ESMTP id 97FA61C0006 for ; Fri, 14 Feb 2025 03:05:35 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=CphOmIU1; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf18.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739502336; a=rsa-sha256; cv=none; b=fsS1Z+sKa7rrnsuv0C+3n6ch3YOCOWEzI0m5rV6putQx7exBlUAkXyUTEq3zGgdHDMQfVj yDJG2HbZGPk+gGDEm+BMrPa/32nPFpCCYiUnAsswj75Lgu5/EwfQbsM3WrOIszpcP4iUSW qzs2DlXZtKSGg+JUATlhI2hlKhZ5+Gw= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=CphOmIU1; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf18.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.180 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=1739502336; 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=880EogUQ7YhTtxOXOr4zFxC4yPI4QQKvoHhCveXLots=; b=1wZO7MwEWCYYbtA6+oBMaW1N+Rsx9OnkcQMeqqC2K1pmD9492kzEPYlYvwh6rtTK5vru5C B5MXj11a3My4VZrJ+FACVpDjN+Zq9HIGuGQRLGMlFWEU6YBMP7NP21LiHv2RjQdzapMqqw PZlukuPcOSQRMAOFvo9AGW94zM4mJVY= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21c2f1b610dso36643395ad.0 for ; Thu, 13 Feb 2025 19:05:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1739502334; x=1740107134; 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=880EogUQ7YhTtxOXOr4zFxC4yPI4QQKvoHhCveXLots=; b=CphOmIU1lFbePIRRRWvM1m4QwM1FpExEsqdBp4v7Hd5QDx3mFshco3DpssT2X0GYGU lDmN4NM+oIuxEcW7UFkix6dIurao+lq1KKz5YGcJSssMGhJONHW/jA/BqJ4ah/+odxgJ l/3OUPIuI0/r8m0//59WKb38UCAvSL3TO2OKNQbrpYlLQ09SSSphljdJ7DSGlWNGVGyE 8MHke1AwbxZ2RdYsFquaUjkGFPB9eAFugVWaTxIlDnENB0S0RehLjAE4QsqhiW+HaIrI T7n7HanCZ4JIE5z6cal8kQE/autcBZghObnGADUHBASToj6LabEJsS5vIw2EfWZxac7x +4DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739502334; x=1740107134; 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=880EogUQ7YhTtxOXOr4zFxC4yPI4QQKvoHhCveXLots=; b=BEoEffIfhHbwSfxjsXMlsisCnxSsjUTol7Nf4fjKxsSb7qwznF9Qx9tkC4C4vLU7qV K318rixVamT8+bEp5K58H0VlflXEen0Ky78cPrasKc1nUMoQU4kebBm7t3AcpO7m4FCc JM5Bb+LJGnRFz3On1pJI6J+zcJC8E3diTnsqMqi+AnIwJ2OoI6wAs01CUp9VvZXGp1Is aboIzXevBWIOMIBQvkAKEAccHZPvVw8cu5mg0p+RyB+pK2CQPimYZhycCoI1CxMN0ZA5 yuxja4bbg+DoT3QVv08FHUCsrdPIxYYfgGEBh2XuEIypWJwqQgIivHyJ/604tryCNQyX p6bA== X-Forwarded-Encrypted: i=1; AJvYcCXgfG2pn+4Buty1+kocwKapDj1gpEs3D6QGTWqX/0dxFsC587kaVJadfMsEz2dzGeaRu8XmdA4TfQ==@kvack.org X-Gm-Message-State: AOJu0YxB/b8td45mBR5JhRzMeCfxBfuLfNA8Rkg/6MQOnSkM/kj6wuEx BzGsfm813P5/E7xJRTmYgETmlz+dqmothj9S+uoXvP6foaw0dTwKMZEzffMnFJA= X-Gm-Gg: ASbGnctPKTIGEywYJ4y338/qOmlOb2i1gyMvNbzmfYU2Rm0jFFlKVhB4BqeAS6ypOW2 DP/mjSgPpf1VswgEmL1H7UoXHiRfNFD9Bmqpxp/nE51/rbg/kIX8J49UuPMpbGeAsc2UbiPzYxb xsxICZReLZjWNQVST4K0NhJGkZYJl2Crr1vlm4zMxAFmh5hyxVpIFL2l63xdRutiFK1XMSj3O35 2w6l85PRbVyGItSIHRcZiwCa2i4B3dVDv5H4bSKWrW8bzdchqysGNoVufkzLpUcGpnRvX81abSS 6ZdYWcN+MOsuEmzyBEEVGGIKIWfrwfCgF5usv2W5IyrpXb/rw8zQdOvY X-Google-Smtp-Source: AGHT+IE0j4ifNKT9H6YLxFTZoD5WzE6IGo9wOiQNtVXNtqnV2ixJQoeneDIT/l4UNMn6vQM3UgH1KQ== X-Received: by 2002:a05:6a20:431b:b0:1ee:6032:b1e9 with SMTP id adf61e73a8af0-1ee6b360aa3mr9894032637.21.1739502334088; Thu, 13 Feb 2025 19:05:34 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.155]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73242568a78sm2130486b3a.55.2025.02.13.19.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 19:05:33 -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 v2] arm: pgtable: fix NULL pointer dereference issue Date: Fri, 14 Feb 2025 11:03:49 +0800 Message-Id: <20250214030349.45524-1-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 97FA61C0006 X-Stat-Signature: nb7idrq4j111wfa6m63n3y8rs5fb3yjt X-Rspam-User: X-HE-Tag: 1739502335-985823 X-HE-Meta: U2FsdGVkX18F7i5Fi9n42AuSu/5oHs7KSpzgPV87bLlKPTDSgDhNAxICuTTbUQoiggfmdRxDwquh/wdPeheoa3C2uT/CMMxkFvD006Q2iNLvgb5sS3iRTnyE7LvEJ9l0nU2IpOHCiYefG2lsT9Pb/PJ+tv6D3Eq9lKg11GsCXA5SZMLKs5nigMvfn2h4Hi4SpsOmTlLqlU9zMTrgYGCs7HEQrmezDNpyn33GyY5LEQ8TT6/UUCtGRJ++HtsPwZZ4TjfTMPGN/eC3HpZiTRxRJPEORGAUOis4iO+c/fzGatBb+TDp4Swor0FCjtDoRV/q0Vm0DINze2QSjC5SU5wThXSK0oGG3KQlLOqeTubNaVfwmD1khT/9dtjc+AtHXPnFzpO1pVgm4g2BPF/CQwjdROoBQU/L9eXCp5LNxSM+AQcZX/W7UYleWGYD+w2LCLOAhN7eggsfIb+jSkcHdvbd1iyAN0cfEGtEoirTeoOtJkpbJVg38PBdXvdmeSBG+5AAU88YsQ2Moq0L0wBN/KUtDbt7/66E6lhIyvkzN1s6Ze6M/VWiXCD2vbTC8j2kpdCpAEYDXUG5Ggm0IiZ+MyvoB3K6Q3REPYf38r/jPs2A0ZjZwiWLIvJY5PFsHqIeeiVVEVEJVSICHIQ/nLYDWVadIwA/ETEM+8g27zUDgnZFOcYY2pI5nLFpwmw0/IIynJF0BwR5Xg+eME3UXK6+9JUaz95stgt00nIajia5DHvzssXZYTj1PI2AM1xrJsIGDje3vD6sZ64Eix785d0C9g/l4Fmu3py9wXgU31itl8/Tw/E4kUNWqoSU8JhBjddKYlN6pXZUEYvBSMB0Z/AFPRITMeAslwyrybdvjK6EwFtVuY/vbNzWvZHMJEup/o1jtZlHzcSMY+KwEGse7pSrGQmZhqdnRg/tHCuk6iO7rHyyutE306Z07/T+huZXpjq0h1Cb7yDrOjK/btPaPcWaZo9 E7GhtkPs MsijALfzt0t/hJ04SiDZfptQSnOTJfs5KbSxtIAzPPd3BFxaDD+ESPCbwAwj6Gg6EX9L+RizOoU00tkApR6Nb6WGYjPbA/tSCOV7BFN8/7K1OgoHYy0D0+2vZs254p6mG5yIKrXVuO3gx0StWRkOcgy6Ckbz6NGkWJK0oFluYqAM6MfwjvPKSZWs2bt/mTti2ZfBxXoqYYZ4oWu7efOVzF98uXLW0l5Kj6JXvA5kGJcdJg+LVmga1FHlTxloQ4fLvahpoHifVG80HyjemXyKjKAdfq5x1q7iLABLv39bcw+DeluI/VwZ2mfBXJGc9BkSy8FOKXibKE5SR6AfZssJzb0SS7yOVHx6MjZA5q8ragPb/zloTV+kj9nztj/PfNPkHy8aEVzjGxtJMRRyaDCS1UjVCl4NItWvBaXal 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 --- Changes in v2: - change Ezra's email address (Ezra Buehler) - some cleanups (David Hildenbrand) arch/arm/mm/fault-armv.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c index 2bec87c3327d2..ea4c4e15f0d31 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,16 +122,18 @@ 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) { struct mm_struct *mm = vma->vm_mm; struct vm_area_struct *mpnt; unsigned long offset; + unsigned long pmd_start_addr, pmd_end_addr; pgoff_t pgoff; int aliases = 0; pgoff = vma->vm_pgoff + ((addr - vma->vm_start) >> PAGE_SHIFT); + pmd_start_addr = ALIGN_DOWN(addr, PMD_SIZE); + pmd_end_addr = pmd_start_addr + PMD_SIZE; /* * If we have any shared mappings that are in the same mm @@ -141,6 +142,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 +160,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 +208,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(); }