From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 41142230BE9 for ; Sat, 15 Aug 2026 05:20:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786771211; cv=none; b=rYSHjIeXetYfnTNx/83vVwHWyE/HQNp24S5YXm0I1mJyDtXVFrR6lfObsqReDZgI+rmndIeRjL05bMwRixps7359IE3wzqRUOF3llrm2Pq1iLOIm2rLi1c6qheP08NlnRS8nH0INOkRXTWUC0koAYVuJWBzXcVvDOkPSHWZUPDc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786771211; c=relaxed/simple; bh=pyjg4tQzeWbPwGazrdi1gvyH5AHb8VIEL7W7KMpA1Sg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dPdtdMyiyegasvEyZDx472nTBXuxmIT2kMhUPo0YMrKdAqxRVzHjMgfA+6GJluVYiZ/gff3AhVtzLnHs9SOxZfzhhXyECYJ0AR5VySu2zvaLmunX/GknxbCmEKIhvB8uBtDyfXJceK0J3XKusIfb8vTZc/8u++DUWKUPNeWWcbk= 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=fPM9uKk5; arc=none smtp.client-ip=209.85.216.45 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="fPM9uKk5" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-381b831d535so2693006a91.0 for ; Fri, 14 Aug 2026 22:20:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786771209; x=1787376009; 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=2LNNcf+87LrqHmKQ3ILDbepTdxy8o+GDR7o/oD8fAmg=; b=fPM9uKk5bydwBUFPCbKodcuiLb4a+vBi/4JI/8FWMvGifiAaq7b4I0KAPFcNzzzYD+ lqx60DIgXhzAf2/cjnuGJzloo/QgQi+J45LS75M+UnuA5d2YauggNrIg3x5ZaM8QQFUF 0t75/I8afq1Ls8P40Y124a54qTpr7j5EdY+qWTwJ6kGanSL3TvL7U7mAXKPhNidcTZIZ /uXV4Jf/2Xr8uswjnMY19Kc0CzGWbNC1K2rW21M6mWhl502ouggfRoYyikFcR7q7EW00 Qdq4Iofw3cHGxqHitmKKeKnSG7qeHjExRybFrqXV9/yPz5+valtwc5QhJTqcK8Djjkx1 Nlrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786771209; x=1787376009; 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=2LNNcf+87LrqHmKQ3ILDbepTdxy8o+GDR7o/oD8fAmg=; b=Ou4f9fTmQzg++g9U8gBXbMVti2Qh1ylkywDqt39Ma3ObKMXOxURk9DrW3PaVIL8Pwf 4Xy8AnaGmPTTl01jPMg2XrgVK1Z0WSJB7t4OZoM811nJ/Tqel6h+stJ8G9mus5/ExeBV XphyZNM1zN+ueRXCL3e/eqjLeJ8HxnDjX9txF+713g5ln+i4rdx96pVeTz1mWdfG98D/ 9YM2qVIIANYgVDP/oaHS8AVYwCc+HEqN+XCule4m7+MExU4+RmQwl8rujWX6ZwwnIYPj j0OplqZpO4gOR6E3YDc4aERfciYOtT+RmU4jFFpYnkoPSPNskSG89Bk+0/lTuakbD+KG rdxQ== X-Forwarded-Encrypted: i=1; AHgh+RrsDPU38pH+FyQbYjpgW0uuzNHFjTuASkiIOIfh5H5VivC85Se9UG8iJxtIh9NdxPWpfMPf0TfL8P9NjgQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx7o0ETZqccIBYbN75TZ4QHotr0jdDH9kR5CL/KMpXSsSucWDtv 6f7kqc/3r+3rk5HWnHDoa5MWJ0niRf4BEIVZ3LUKXSqJeF+vpZIKDFDOCIConlXM X-Gm-Gg: AR+sD11s4CVPW5usFd+4teM4NQCaQ0Wzkakoe8+U33oTzDtjhdpjGgS5MKjp7qpv0mI xcTDlr70dTji/HJwr0e6y69qjV1LPYHu3r96kL0/BSMW0TDDLlPjf8qZv7y3qZxvoUwfXoZCyD+ 44+qJ4DBm8IgYgbWlvNEF5Z0rWMNdzElNBY3T0WnFSgZ0HM3yKQQRXdlJ1x1qadou4Wk0AEkaj2 NWp4lSTZtwwkOLIJWLVW/Udev5989mSCUGy0dMWfFMIcdze4vuqR1l+JQblDSx0HygFCfyQLxZH zZr39ljB5W0dWk4JNu/9dyytvO3lHg5I/uJkxMJyisTxvbRv6DI2fr2dLWZNF39Qc4LhH7fh3V2 xDY9buXiKagcIY0KlWYlsbDgxgE3MjTt9fB4nwxiDRuWUuNgeSLZinZgsecwIBcVrZz9o1RL2oQ JNVq4nrm46xOfUMzi0tPEeZ10JdCgVciIDqVAS4vmE3he/aFCiMjMD92S6glQ2E8rvPrkZ9XF0 X-Received: by 2002:a17:90b:48ce:b0:390:b41a:b92b with SMTP id 98e67ed59e1d1-3933b6d05c3mr13639215a91.4.1786771209186; Fri, 14 Aug 2026 22:20:09 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 22:20:08 -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 2/3] mm: khugepaged: fix folio is used after pte_unmap_unlock() Date: Sat, 15 Aug 2026 13:19:23 +0800 Message-ID: <20260815051924.194810-3-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 After the page table lock has dropped, the folio can be freed concurrently. The trace_mm_khugepaged_scan_pmd() is left with a dangling folio pointer. So using the folio_pfn() before dropping the page table lock, closing use-after-free window. Fixes: 7d2eba0557c1 ("mm: add tracepoint for scanning pages") Cc: stable@vger.kernel.org Signed-off-by: Vernon Yang --- include/trace/events/huge_memory.h | 6 +++--- mm/khugepaged.c | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index d3572d4ef453..5dc71d292f47 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -55,10 +55,10 @@ SCAN_STATUS TRACE_EVENT(mm_khugepaged_scan_pmd, - TP_PROTO(struct mm_struct *mm, struct folio *folio, + TP_PROTO(struct mm_struct *mm, unsigned long pfn, int referenced, int none_or_zero, int status, int unmapped), - TP_ARGS(mm, folio, referenced, none_or_zero, status, unmapped), + TP_ARGS(mm, pfn, referenced, none_or_zero, status, unmapped), TP_STRUCT__entry( __field(struct mm_struct *, mm) @@ -71,7 +71,7 @@ TRACE_EVENT(mm_khugepaged_scan_pmd, TP_fast_assign( __entry->mm = mm; - __entry->pfn = folio ? folio_pfn(folio) : -1; + __entry->pfn = pfn; __entry->referenced = referenced; __entry->none_or_zero = none_or_zero; __entry->status = status; diff --git a/mm/khugepaged.c b/mm/khugepaged.c index e7830761d3a2..7c8c48577408 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1603,6 +1603,7 @@ static enum scan_result collapse_scan_pmd(struct mm_struct *mm, enum scan_result result = SCAN_FAIL; struct page *page = NULL; struct folio *folio = NULL; + unsigned long pfn = -1; unsigned long addr; unsigned long enabled_orders; spinlock_t *ptl; @@ -1778,6 +1779,7 @@ static enum scan_result collapse_scan_pmd(struct mm_struct *mm, result = SCAN_SUCCEED; } out_unmap: + pfn = folio ? folio_pfn(folio) : -1; pte_unmap_unlock(pte, ptl); if (result == SCAN_SUCCEED) { /* collapse_huge_page expects the lock to be dropped before calling */ @@ -1788,7 +1790,7 @@ static enum scan_result collapse_scan_pmd(struct mm_struct *mm, *lock_dropped = true; } out: - trace_mm_khugepaged_scan_pmd(mm, folio, referenced, + trace_mm_khugepaged_scan_pmd(mm, pfn, referenced, none_or_zero, result, unmapped); return result; } -- 2.53.0