From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 876702E8B96 for ; Thu, 20 Nov 2025 19:15:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763666153; cv=none; b=UrwC8pNA8bmBBYAFUZ/p7kWlyZO2k0GPyc1WwIYBTpQTLKLVL/l2CNy1icSxfpuZagza+zXkkuF8Y726Q4mLiXj+rodqP1VTSoLzN5Ry64v4lh9h6SnmZeSODNFGeYM6If0tY5NfDORZ8BrbKHnCE5XECSfu+5+7nZ1Y2ODFpYY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763666153; c=relaxed/simple; bh=fBLTANODSfkqSh8+8qVVdC4+k64zS+gYxxbuXJMJzJw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Aq0YasuxHpFmat8TYInw/LDLie6VRtwwZowdatkM2quzQDrrgjsQb4og8ufl+FEwKPoYtLZGC4KmK9CsKOfiR0FJCWFSTDr+mRCP23TFRblBRyzFVeP8JfQLeCcJKTd9GysP1r4hGId9BT9DROGzav7+1SU7lkjmV4qNpbWVCgg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DQPXZKKF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DQPXZKKF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5621C4CEF1; Thu, 20 Nov 2025 19:15:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763666153; bh=fBLTANODSfkqSh8+8qVVdC4+k64zS+gYxxbuXJMJzJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DQPXZKKFkH8ik0HBgj/nncueALahwSwDFU1jF2560Pvg4joIOYdsyuswvTCHGWZHW OV0mg12Duhl7PNcgng2+kl2RWCpVhImH+/EG04u5BBPmaWUaqFc8NnE6nY8xPfp7Hy zA8INz4cKAf0WFu2kVfbNYwS+8/9tbDYlH9WY6vkcP7rUshSYD2FQCQRauhuYe8YH+ 0hMPY4cEo0X7r9TNyZ89hsAo7YVU0jy6wNe/7PHBUZZ6ZGxtlwGDutNFguvypujVlx eABgC8f+KWfoGcAnkLRvZaGFla4GhPGX/i82nKcDL/b0SDxAEgPJtVG0TO9FlLYiH8 O7w4wj+6Kx2fw== From: Mike Rapoport To: stable@vger.kernel.org Cc: Mike Rapoport , Lance Yang , Google Big Sleep , David Hildenbrand , Lorenzo Stoakes , "Matthew Wilcox (Oracle)" , Andrew Morton Subject: [PATCH 6.1.y] mm/secretmem: fix use-after-free race in fault handler Date: Thu, 20 Nov 2025 21:15:47 +0200 Message-ID: <20251120191547.2344004-1-rppt@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <2025112032-parted-progeny-cd9e@gregkh> References: <2025112032-parted-progeny-cd9e@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Lance Yang When a page fault occurs in a secret memory file created with `memfd_secret(2)`, the kernel will allocate a new page for it, mark the underlying page as not-present in the direct map, and add it to the file mapping. If two tasks cause a fault in the same page concurrently, both could end up allocating a page and removing the page from the direct map, but only one would succeed in adding the page to the file mapping. The task that failed undoes the effects of its attempt by (a) freeing the page again and (b) putting the page back into the direct map. However, by doing these two operations in this order, the page becomes available to the allocator again before it is placed back in the direct mapping. If another task attempts to allocate the page between (a) and (b), and the kernel tries to access it via the direct map, it would result in a supervisor not-present page fault. Fix the ordering to restore the direct map before the page is freed. Link: https://lkml.kernel.org/r/20251031120955.92116-1-lance.yang@linux.dev Fixes: 1507f51255c9 ("mm: introduce memfd_secret system call to create "secret" memory areas") Signed-off-by: Lance Yang Reported-by: Google Big Sleep Closes: https://lore.kernel.org/linux-mm/CAEXGt5QeDpiHTu3K9tvjUTPqo+d-=wuCNYPa+6sWKrdQJ-ATdg@mail.gmail.com/ Acked-by: David Hildenbrand Reviewed-by: Mike Rapoport (Microsoft) Reviewed-by: Lorenzo Stoakes Cc: Matthew Wilcox (Oracle) Cc: Signed-off-by: Andrew Morton (cherry picked from commit 6f86d0534fddfbd08687fa0f01479d4226bc3c3d) [rppt: replaced folio with page in the patch and in the changelog] Signed-off-by: Mike Rapoport (Microsoft) --- mm/secretmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/secretmem.c b/mm/secretmem.c index 624663a94808..0c86133ad33f 100644 --- a/mm/secretmem.c +++ b/mm/secretmem.c @@ -82,13 +82,13 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf) __SetPageUptodate(page); err = add_to_page_cache_lru(page, mapping, offset, gfp); if (unlikely(err)) { - put_page(page); /* * If a split of large page was required, it * already happened when we marked the page invalid * which guarantees that this call won't fail */ set_direct_map_default_noflush(page); + put_page(page); if (err == -EEXIST) goto retry; -- 2.50.1