Commit de879896 authored by Deepanshu Kartikey's avatar Deepanshu Kartikey Committed by Andrew Morton
Browse files

mm/memfd: fix information leak in hugetlb folios 

When allocating hugetlb folios for memfd, three initialization steps are
missing:

1. Folios are not zeroed, leading to kernel memory disclosure to userspace
2. Folios are not marked uptodate before adding to page cache
3. hugetlb_fault_mutex is not taken before hugetlb_add_to_page_cache()

The memfd allocation path bypasses the normal page fault handler
(hugetlb_no_page) which would handle all of these initialization steps. 
This is problematic especially for udmabuf use cases where folios are
pinned and directly accessed by userspace via DMA.

Fix by matching the initialization pattern used in hugetlb_no_page():
- Zero the folio using folio_zero_user() which is optimized for huge pages
- Mark it uptodate with folio_mark_uptodate()
- Take hugetlb_fault_mutex before adding to page cache to prevent races

The folio_zero_user() change also fixes a potential security issue where
uninitialized kernel memory could be disclosed to userspace through read()
or mmap() operations on the memfd.

Link: https://lkml.kernel.org/r/20251112145034.2320452-1-kartikey406@gmail.com


Fixes: 89c1905d ("mm/gup: introduce memfd_pin_folios() for pinning memfd folios")
Signed-off-by: default avatarDeepanshu Kartikey <kartikey406@gmail.com>
Reported-by: default avatar <syzbot+f64019ba229e3a5c411b@syzkaller.appspotmail.com>
Link: https://lore.kernel.org/all/20251112031631.2315651-1-kartikey406@gmail.com/ [v1]
Closes: https://syzkaller.appspot.com/bug?extid=f64019ba229e3a5c411b


Suggested-by: default avatarOscar Salvador <osalvador@suse.de>
Suggested-by: default avatarDavid Hildenbrand <david@redhat.com>
Tested-by: default avatar <syzbot+f64019ba229e3a5c411b@syzkaller.appspotmail.com>
Acked-by: default avatarOscar Salvador <osalvador@suse.de>
Acked-by: default avatarDavid Hildenbrand (Red Hat) <david@kernel.org>
Acked-by: default avatarHugh Dickins <hughd@google.com>
Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Jason Gunthorpe <jgg@nvidia.com> (v2)
Cc: Christoph Hellwig <hch@lst.de> (v6)
Cc: Dave Airlie <airlied@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f5e31a19

mm/memfd.c

+27 −0
Original line number Diff line number Diff line
@@ -96,9 +96,36 @@ struct folio *memfd_alloc_folio(struct file *memfd, pgoff_t idx) 
						    NULL,

						    gfp_mask);

		if (folio) {

			u32 hash;



			/*

			 * Zero the folio to prevent information leaks to userspace.

			 * Use folio_zero_user() which is optimized for huge/gigantic

			 * pages. Pass 0 as addr_hint since this is not a faulting path

			 *  and we don't have a user virtual address yet.

			 */

			folio_zero_user(folio, 0);



			/*

			 * Mark the folio uptodate before adding to page cache,

			 * as required by filemap.c and other hugetlb paths.

			 */

			__folio_mark_uptodate(folio);



			/*

			 * Serialize hugepage allocation and instantiation to prevent

			 * races with concurrent allocations, as required by all other

			 * callers of hugetlb_add_to_page_cache().

			 */

			hash = hugetlb_fault_mutex_hash(memfd->f_mapping, idx);

			mutex_lock(&hugetlb_fault_mutex_table[hash]);



			err = hugetlb_add_to_page_cache(folio,

							memfd->f_mapping,

							idx);



			mutex_unlock(&hugetlb_fault_mutex_table[hash]);



			if (err) {

				folio_put(folio);

				goto err_unresv;