From mboxrd@z Thu Jan 1 00:00:00 1970 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 87C23C02198 for ; Wed, 12 Feb 2025 08:20:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 05D84280002; Wed, 12 Feb 2025 03:20:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 00D88280001; Wed, 12 Feb 2025 03:20:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC989280002; Wed, 12 Feb 2025 03:20:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id BFEF6280001 for ; Wed, 12 Feb 2025 03:20:28 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6486DC124C for ; Wed, 12 Feb 2025 08:20:28 +0000 (UTC) X-FDA: 83110595736.11.8A9767C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf10.hostedemail.com (Postfix) with ESMTP id CFA4AC000A for ; Wed, 12 Feb 2025 08:20:25 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NVD08XIG; spf=pass (imf10.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739348426; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Ip9E1CfkRC9Vcb9bxsI6NSkr9QdKRS3qpRbaSmxdcRY=; b=iLcVd4ZI2MEMwUz7SFc9GEHvxWk/6ho5xWZKHdWzAFjLLeiN+s8tP16S8wECa10DCH29R0 iJP607A4nY4/ztK/1ads/wLgycaxaKHtuxfq+kSwQ98YtJpQTVf5tqVjKMlExmsYIPy1sZ 5JVpj2fXy5bSLKoVhR0rrT/PttYqcmI= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NVD08XIG; spf=pass (imf10.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739348426; a=rsa-sha256; cv=none; b=KmCGfTw8CTwRRmv+qvZ3E+g1X7m3ASyk3uZviIqMTCp4ZMYpWpDGTrTLJagJHOjcwcFDXL d1z5JYiE1xgxQIasteupDEB/V8VhlQaxRgRzSanZm+xGx1mOfdyES8/c8UnyqnFAJhMhM7 AQsuV0194JyVOzDR2UW+zCjFQdLRglM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739348425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=Ip9E1CfkRC9Vcb9bxsI6NSkr9QdKRS3qpRbaSmxdcRY=; b=NVD08XIGxbvJw8aCJmgnDV/AuPQt4b08oNOzlQ4rLoyFFOVeSGHE+TebxlrFepAeqel44u vZ6E6k6A4Aj4cFPLYnxvHr+QnlhgmGkMJWHFPr7qqooIER7vIr5gxHUJddfnJvoom0gtkQ rOLoMVxSK1Cmdr6fSiCyAdQe26XY0FU= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-387-1MyGHM21O8SyfYgEcMom2A-1; Wed, 12 Feb 2025 03:20:23 -0500 X-MC-Unique: 1MyGHM21O8SyfYgEcMom2A-1 X-Mimecast-MFC-AGG-ID: 1MyGHM21O8SyfYgEcMom2A Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-38dd533dae6so1343896f8f.2 for ; Wed, 12 Feb 2025 00:20:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739348423; x=1739953223; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=Ip9E1CfkRC9Vcb9bxsI6NSkr9QdKRS3qpRbaSmxdcRY=; b=TPmDK1BDsdoJLWlaTXRjkPrVNGRHVuymE6jVpwzlMgwoCEEdnBUGufovsmU5hrAsy4 lrmzEJFFeXfe0efIiI94D+uSLDcf9qlgj7yaXT4KEL0359G5oWJyuwq+iNYpS1rd5AH5 zeMSYrkz4g0XcW/2r1CpKuLUBZzCTy27sJiLg/tPRm54I3FkfgZWNq0tqy0axEDQi5DH EP8u3lG34CWp+V1G9Hu6wUQv/MKtyGHcMdDMzEns1JolG9pedt7u4rf4zMgd3E6+6XP5 W6nodhn4IK5x1/dKaJ8mpqs/ansuYhx80DfJyHS8GxZuKRXXQLKL3juITFvT2kVP6hz8 mU4w== X-Forwarded-Encrypted: i=1; AJvYcCVCHQ7y2KfLFH8RaqOoNzBLbexK90/OYG2z6Dip9F3q8m1dlZPr9JLtrEJegPVt+Zmi0cLubDr5Ow==@kvack.org X-Gm-Message-State: AOJu0YzGlK6kf8MA0xMTS6IT8NG8LztSonflbtK74d2zm0SKoin7RVJz 5LRdgoZdIltMzUvaZyUos4MO2xRYCvD4EtNxuJV9JU56okjryYDCLxkLDEKWo2ITPrFqOH1zbbk c6LafEy2OMqthYDPRtw4EwsYNBmUVSc6c6LJDYw7Z5AraNFPX X-Gm-Gg: ASbGncu9hD5+Yckg71mS17e8okVryxOcUBM2I/jJZ9K0iC8XOakjo4SbkYfRIMcACnM fQKNjAtP2Z4045BxCrYrFXcAxdMIbuc9Gfq3zpBM0qsGqAqvr6RDOwAoQZnVwfnFUIOH1hueiDz bsEY152KbkzrMSIfUIqaxkrRBSWjdf6nTxxRLPwMis2DjexIm1CYPiX5XcuJneoPpGJZsYPrPl3 YB9Swk0GmX7pBNh+nIvwYpFTnGRmiw0rTaPipGpsV9rRpD2fDHRPQbwtwN1M+0SWBz8ZAqOkkK3 twgdbalApwmO14EFoEDsQcnmJZ7W5CUF6WYptcDMHGehXuUjM/1RDLIThYJOi4BZBnz23DHxzT3 CBp1X0fSDwCDg0MM4mZW3NzWGVWT+4Q== X-Received: by 2002:a5d:4ac3:0:b0:38d:db8b:f518 with SMTP id ffacd0b85a97d-38dea289689mr1334158f8f.22.1739348422655; Wed, 12 Feb 2025 00:20:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IFDiAn5jK616MdAOfAfYMVUT9zNM9+jEtMDT3b0cH3qnNzPUlBYFG45nWaSD905rA0F+LnzPA== X-Received: by 2002:a5d:4ac3:0:b0:38d:db8b:f518 with SMTP id ffacd0b85a97d-38dea289689mr1334131f8f.22.1739348422230; Wed, 12 Feb 2025 00:20:22 -0800 (PST) Received: from ?IPV6:2003:cb:c70c:a600:1e3e:c75:d269:867a? (p200300cbc70ca6001e3e0c75d269867a.dip0.t-ipconnect.de. [2003:cb:c70c:a600:1e3e:c75:d269:867a]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dcd0fac67sm13744585f8f.54.2025.02.12.00.20.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 12 Feb 2025 00:20:21 -0800 (PST) Message-ID: Date: Wed, 12 Feb 2025 09:20:19 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] arm: pgtable: fix NULL pointer dereference issue To: Qi Zheng , linux@armlinux.org.uk, ezra@easyb.ch, 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, stable@vger.kernel.org References: <20250212064002.55598-1-zhengqi.arch@bytedance.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250212064002.55598-1-zhengqi.arch@bytedance.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: VRTElqzRegzz3UvWS11QM4CdXkq5pD5K3A643a3Vrtk_1739348423 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: CFA4AC000A X-Stat-Signature: p38dejokkrayezooi1iptnco37h7mh3p X-Rspam-User: X-HE-Tag: 1739348425-976864 X-HE-Meta: U2FsdGVkX18hL7/tsXEnJIPZDfySSvoY6nQqUO0XyK13ROU+QcysDB0G1GcffV8rDsV5woOYFp56JmxYlbwao5+E5AC5WOULbV3MIx22JmDvT0InSaEmH/d4q0mAGWBpgkVoiEnd41sdxxegupr8c4zLoOlMTIBIFgywYFDG7btncjlkk42NAtv+gurQNyVC9z4mzVGY3gNvqx+JRY0skAANMoAwC7eZOJRRAFcnaRD1E5DHCkwqLmAAEybAN4RnF/ljhHldTIwkxEaOFjE++JBGZyBdeVmnoYqChpnMtIavgQ9JF0wavxxqIZE3objQBB9b+BF5/bTUmV6hX8Y3C05lWDPpkWV82ncX2G4wsvXT1/1YjniZwAq2GmtzY1ZTZyBDO7Go7LU9QkAi+CUZXbBZ7TApVATb+EmGEHXhQNR95Pq7rWz1XWGFJStJqwloPD+Y28l/VIBwmG21dMpliFUDPz6f2sMvKAmA50mF72XMtSFRb9AxqqClXIkkiAn1Krtj7rPr+E0GUgBzm8EPgZQRU/nd6XAYWIQQdzj0d0x9K8JpE8KNRgghUcmApBF5S1zaV04lM1qDYjoT3Gu7XstTOELyAv7JZl8TsEVBnSQQlDohuNitGgkTR8vPoe5avvsZLmCO1hmjv0/4zca0PsyPWNgLEYn2wwgNIchn5dyg1jEfOQSDcyVU+gvKO5/Pcg8j6AXi0vMS1D9fbwBstAhRVzETJdJXmmT70+z0L3JryOqmoY0zBGoFpLUvVkOQR34USQCUuALTWRhXxBK3KWVGLcN0jKuMEwuzSm4F6Tr8iJgzqEgBzlPMlqu1YqnpdEjYqoDb/Yp5Mc2XO4MK+MKhCNAjfhVCDCCMXk9Mly/K9CDBpkmywCZXTYCIjy0og4iRZWb0VNn0hrFlOXHWRRhOyqMR4Fdimn8aZsueru4F+yNhkIPek4Bp/lLnQjSEQNYgi1ELREKxvsyZYw2 USzLkXfA 4KlyXxfGSfOJHzA2vhGvPl3kR0/zI1mD8PK3UGE+9uTcLokSpsx9AMPkqPGVHI/1yVAy3/+0SyyapvppVJnxfxeRN3cYnjTyhBWqvP66cqvGo9t6ZrM8CoNHdH5mcmGwGndUM4sCJj1NsR6Jy2AKHBtoMIQAl+Irf0allbG3M3QiI7m19Vr0sxnls0VXOoGhXEM3U7RKVkNPJF8dsrs5SmOLn4d4SX4R0z4C1M/JIELXbUaLyZ9VqRkgHczSLQbAG6GlJojA2ukRbn4ccCskkqJvlpWmR5IXWoMbvF5zl4Iw33/QopnIvx+zA3v3lgpv9XMo6pJFQt+DxqZAY2quPC1rvdPilJqI/+eDIzHmE6I1Jj5gRtgvKRw6Mkik5EHQCUvLM2MeTnuaN08bcHUlFZTifgw3j62sS5ph7mSKcpobxduZS6U3hr/WhLuVpJ8OZ4T2GWibQQ4i7BiGcxqgfZl2Uqg== 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: On 12.02.25 07:40, Qi Zheng wrote: > 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 > --- > arch/arm/mm/fault-armv.c | 40 ++++++++++++++++++++++++++++------------ > 1 file changed, 28 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c > index 2bec87c3327d2..3627bf0957c75 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,17 @@ 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 start; > pgoff_t pgoff; > int aliases = 0; > > pgoff = vma->vm_pgoff + ((addr - vma->vm_start) >> PAGE_SHIFT); > + start = ALIGN_DOWN(addr, PMD_SIZE); I assume you can come up with a better name than "start" :) aligned_addr ... pmd_start_addr ... Maybe simply pmd_start_addr = ALIGN_DOWN(addr, PMD_SIZE); pmd_end_addr = addr + PMD_SIZE; Then the comparison below also becomes easier to read. > > /* > * If we have any shared mappings that are in the same mm > @@ -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) { > + unsigned long mpnt_addr; > + /* > + * 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); Nit: move "unsigned long mpnt_addr;" below this longer variable+init. > + > /* > * If this VMA is not in our MM, we can ignore it. > * Note that we intentionally mask out the VMA > @@ -151,7 +159,15 @@ 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; > + /* > + * If mpnt_addr and addr are mapped to the same PTE page, there > + * is no need to hold the pte lock again, otherwise a deadlock > + * will occur. /* * Avoid deadlocks by not grabbing the PTE lock if we already hold the * PTE lock of this PTE table in the caller. */ ? > + */ > + if (mpnt_addr >= start && mpnt_addr - start < PMD_SIZE) > + need_lock = false; -- Cheers, David / dhildenb