From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACD2E29C327 for ; Sat, 15 Aug 2026 05:20:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786771216; cv=none; b=egeIBAEqptXDs3EKTl2/F7B8sjayLjnymY0MMnoNoK5LlrQDEEf1ktAHm2qLcym24i+6of3y2KUAFYXzX7UypXrnR9C/1Pn470RhYZUe+piwueCOsfX/R5dG4AOkoQb1LFHMA485geJOUBsbnYW5aJwca+Sl01OuwDPSu3gWIx8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786771216; c=relaxed/simple; bh=jfucFgPT6pmFcjHVONsvKl7Ym2miaiPtaKIoa58Whlo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dwMea95GOskNOeMAkytKGM05bxLBDFRxVt9sINnbhXVOGgYjteAM2l3Y0fo215BUiOYXAX5Cwp0fuF0Hulkd2Dk1Ohvup14IQkJKU55wr5bsXx84ztUvySHFhsWASX75HFwNvSvj1dO8nBReuDuajtky+Omc4s4rcZmKolVw5f0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AK4kvOyZ; arc=none smtp.client-ip=209.85.216.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AK4kvOyZ" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-38e041ea211so1893919a91.0 for ; Fri, 14 Aug 2026 22:20:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786771215; x=1787376015; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=MGLWuLEG0kDSgM2QRoCYSrx2dw3K2Ihdk1BDWCYkYo4=; b=AK4kvOyZXbCLRVel34vgjAj8laW0nH+gBSvjbQhawT2FA80pUV7VevN78HTdLAzjcg Tj2x+xk3XiYUw3P/59PIe7+3HlCYzEcBfqYygJfmwfLaSVLn9y3+4bIVX0s54i+H+9NL 0xXewOu8O6jWBE58rBlq8PbAR8/GTFHaCtpRxB3yfeq1SEYvDcg+d8eHPulzu8oXwor8 2ohm4eRc/N+Cd3gQ3KNYJW6YSTFfst0uSPnWRIxu/qEy2bSlcDlBVfmNquLWXVaBeD7w U3AYnFwQqrv/2x4eA0J7D6jynwagxDZmCQcdTFpCnBEvBwnw/Gt43bkUFO0Aq2YGyt+V Ibhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786771215; x=1787376015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=MGLWuLEG0kDSgM2QRoCYSrx2dw3K2Ihdk1BDWCYkYo4=; b=mv+FoBLdwC7GODLBN0grEP3faQp1VnIOlGMZE/A/Z/UVesLuhG0h0PVUp4CHth4nAQ rHOXsWtKHO7S4e78Q3be6qBvPqLWskuMs+CLCdal2fBY07TIYPGF1faLo9/t2hxJ7nXV GzyqKwyS1lVA3zxtzehkFI3eP96Lecm3fcp4RiOMSnPvmBaehadnpoSdLg004rGORmYp l20ATduwYZXrh+Fb0583jMby9lNEQyfZXhv+6ELldUxIL7HrHd+6q/refpOtDXrUP+wn mHS7UKYllNG7ZzpUhoACSIMiCY3aECnwtopP9QnWmKuY3yU85BeZpettzO6zFUutgbGE uq/A== X-Forwarded-Encrypted: i=1; AHgh+Rp9YyXxBHxo8Z2XJzFA5XY4l6oxdVlNwEJvSt4ePU8wFByEpsF7+b1f+ry7GrejLdqc/4OCl95iXi7y+2I=@vger.kernel.org X-Gm-Message-State: AOJu0YyZzSDJtxXH2hkD4u8KRC/JlfO1pADPGX0qUn2s29tQauCBY/vz WcpXBz5f6ac2DyBcPOQHy+39nnHIJgr5VzPDDWvwL5d+GZ2xefqvRsg1 X-Gm-Gg: AR+sD11wZeMxmvR8qxQIavHhs1iApooxKxVOy8oNWpnYyXl/L+1ZUCLZMzZvD81oDGB FS5/enqChueAlEHJFL5EInvsYmuD0UMwAYmmp46Qj7yNVUsq/4T+H4odKnvtx1zIi93PVY0HhP2 gL2lv7cfxI40WaUR3hwPsUuYwOUBeSSP3LE0y+gzwOK6P1vrotteYBhebp/zvLISOcA16oYUglm nrVS0jN1tKV0t7ROVwr47pRW89lR7wC1CzBATrqXTw84DGeceh2pHAE9jPn0dY1kduj+7WBhvHX j5Z70JKAKlb4+pgMkXlnFKz3prE0RJEmImPZU+AOQto4Vcl3YLM09+iMzG1sSSVlE+KaI/8mIi7 XCT1swgSXzutwK4JpIXdv/nwE3ca5i/xXEQ26REAfEgUnBWI8XGlb6KhIjGIOufB/94oN2k4q9E lpVS8nOs414fyZi+9IUKHUOVLN7jRQOkx9JwT2hWZDHiYiDLCkIxxXdsTpxHKwAZ2Sx/Lw5s3a X-Received: by 2002:a17:90b:4a8c:b0:381:bc4c:da56 with SMTP id 98e67ed59e1d1-3933b95158dmr10890633a91.19.1786771214559; Fri, 14 Aug 2026 22:20:14 -0700 (PDT) Received: from localhost.localdomain ([49.79.111.198]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-394ea96c7fcsm5269702a91.3.2026.08.14.22.20.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 22:20:14 -0700 (PDT) From: Vernon Yang To: akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org Cc: nico.pache@linux.dev, ryan.roberts@arm.com, dev.jain@arm.com, baohua@kernel.org, lance.yang@linux.dev, usama.arif@linux.dev, zokeefe@google.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Vernon Yang , stable@vger.kernel.org Subject: [PATCH v2 3/3] mm: khugepaged: fix folio is used after folio_put/unlock() Date: Sat, 15 Aug 2026 13:19:24 +0800 Message-ID: <20260815051924.194810-4-vernon2gm@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260815051924.194810-1-vernon2gm@gmail.com> References: <20260815051924.194810-1-vernon2gm@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Vernon Yang On the rollback path, folio_put() has already dropped the last reference of new_folio. On the success path, new_folio is already unlocked and can be freed concurrently. The trace_mm_khugepaged_collapse_file() is left with a dangling folio pointer. So using the folio_pfn() before dropping the reference, closing use-after-free window. Fixes: 4c9473e87e75 ("mm/khugepaged: add tracepoint to collapse_file()") Cc: stable@vger.kernel.org Signed-off-by: Vernon Yang --- include/trace/events/huge_memory.h | 6 +++--- mm/khugepaged.c | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index 5dc71d292f47..1b301d4e2dba 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -211,10 +211,10 @@ TRACE_EVENT(mm_khugepaged_scan_file, ); TRACE_EVENT(mm_khugepaged_collapse_file, - TP_PROTO(struct mm_struct *mm, struct folio *new_folio, pgoff_t index, + TP_PROTO(struct mm_struct *mm, unsigned long new_pfn, pgoff_t index, unsigned long addr, bool is_shmem, struct file *file, int nr, int result), - TP_ARGS(mm, new_folio, index, addr, is_shmem, file, nr, result), + TP_ARGS(mm, new_pfn, index, addr, is_shmem, file, nr, result), TP_STRUCT__entry( __field(struct mm_struct *, mm) __field(unsigned long, hpfn) @@ -228,7 +228,7 @@ TRACE_EVENT(mm_khugepaged_collapse_file, TP_fast_assign( __entry->mm = mm; - __entry->hpfn = new_folio ? folio_pfn(new_folio) : -1; + __entry->hpfn = new_pfn; __entry->index = index; __entry->addr = addr; __entry->is_shmem = is_shmem; diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 7c8c48577408..7df0fd2d2fdc 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2247,6 +2247,7 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr, struct address_space *mapping = file->f_mapping; struct page *dst; struct folio *folio, *tmp, *new_folio; + unsigned long new_pfn = -1; pgoff_t index = 0, end = start + HPAGE_PMD_NR; LIST_HEAD(pagelist); XA_STATE_ORDER(xas, &mapping->i_pages, start, HPAGE_PMD_ORDER); @@ -2626,6 +2627,7 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr, retract_page_tables(mapping, start); if (cc && !cc->is_khugepaged) result = SCAN_PTE_MAPPED_HUGEPAGE; + new_pfn = folio_pfn(new_folio); folio_unlock(new_folio); /* @@ -2664,12 +2666,13 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr, } new_folio->mapping = NULL; + new_pfn = folio_pfn(new_folio); folio_unlock(new_folio); folio_put(new_folio); out: VM_BUG_ON(!list_empty(&pagelist)); - trace_mm_khugepaged_collapse_file(mm, new_folio, index, addr, is_shmem, file, HPAGE_PMD_NR, result); + trace_mm_khugepaged_collapse_file(mm, new_pfn, index, addr, is_shmem, file, HPAGE_PMD_NR, result); return result; } -- 2.53.0