From nobody Sat Nov 30 05:34:30 2024 Received: from smtp-fw-52004.amazon.com (smtp-fw-52004.amazon.com [52.119.213.154]) (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 823EC1A3054 for ; Wed, 11 Sep 2024 14:37:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.119.213.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726065442; cv=none; b=ERxRUPByt4PHsH5Ctosgfp7Lqoa30RXsV38eQXKYlI4R/aiJl5OIJaVficto9kkwti2VQtT2QVTmErMkxSln+gpYtcdyyC07Upc01NyQj/LcEMaHQnRZ4ZcROZuankP/FvVhvgeEMDYPEFPL62hV6+0RYXF9V6xxON4e38QqYvE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726065442; c=relaxed/simple; bh=Si9Upc2GbecJX04sbCs0KyaR9A+PIgrmZDDDvD8elO0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=U2S+7hpPKbyua6BSHu8r/wEuL1iEFD4w5WIwhki0A6OonI+MKdraQOMp5TUWIfwlNPr0ufJZF9SX/6LJ7m65BfK+XMxH2MUqam3wY8w6iqQpH0YsoCe1nm4+nOFP1kNPdM5fFYns4WcJPyS25IDyB1xrUjECgmSFHRAHWVUR0l4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.de; spf=pass smtp.mailfrom=amazon.de; dkim=pass (1024-bit key) header.d=amazon.de header.i=@amazon.de header.b=SnFEoqs5; arc=none smtp.client-ip=52.119.213.154 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amazon.de header.i=@amazon.de header.b="SnFEoqs5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1726065441; x=1757601441; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Y9TjOwsiSXZl9P0/RyFMFJbYNQPYXtbeuapzd5F/ewk=; b=SnFEoqs5DMZ29EiE3PhcVxS0yDDvNCc1bmhFj9H9Cb9LH+wmIemx0ZkR JYbi3WaroCkKcUMFIrV0V+s6cvir9MCu4ZMg3H/BobXai7eNLzU1nDInb YsUZWpW4lAwHUznmjdMgpxHpnVwYwIgsePm1GgI05m7qW7sCNyOsIAK44 M=; X-IronPort-AV: E=Sophos;i="6.10,220,1719878400"; d="scan'208";a="231193640" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.43.8.2]) by smtp-border-fw-52004.iad7.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2024 14:36:07 +0000 Received: from EX19MTAEUC001.ant.amazon.com [10.0.17.79:61643] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.38.136:2525] with esmtp (Farcaster) id 3550e7db-38ee-4821-b3d5-b8907b20a81c; Wed, 11 Sep 2024 14:36:06 +0000 (UTC) X-Farcaster-Flow-ID: 3550e7db-38ee-4821-b3d5-b8907b20a81c Received: from EX19D033EUB004.ant.amazon.com (10.252.61.103) by EX19MTAEUC001.ant.amazon.com (10.252.51.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.34; Wed, 11 Sep 2024 14:36:01 +0000 Received: from EX19MTAUEC001.ant.amazon.com (10.252.135.222) by EX19D033EUB004.ant.amazon.com (10.252.61.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.34; Wed, 11 Sep 2024 14:36:01 +0000 Received: from dev-dsk-faresx-1b-27755bf1.eu-west-1.amazon.com (10.253.79.181) by mail-relay.amazon.com (10.252.135.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.34 via Frontend Transport; Wed, 11 Sep 2024 14:35:59 +0000 From: Fares Mehanna To: CC: , Fares Mehanna , Roman Kagan , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , Andrew Morton , Kemeng Shi , =?UTF-8?q?Pierre-Cl=C3=A9ment=20Tosi?= , Ard Biesheuvel , Mark Rutland , "Javier Martinez Canillas" , Arnd Bergmann , Fuad Tabba , Mark Brown , Joey Gouly , Kristina Martsenko , "Randy Dunlap" , Bjorn Helgaas , Jean-Philippe Brucker , "Mike Rapoport (IBM)" , David Hildenbrand , "moderated list:KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)" , "open list:KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)" , open list , "open list:MEMORY MANAGEMENT" Subject: [RFC PATCH 2/7] mm/secretmem: implement mm-local kernel allocations Date: Wed, 11 Sep 2024 14:34:01 +0000 Message-ID: <20240911143421.85612-3-faresx@amazon.de> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240911143421.85612-1-faresx@amazon.de> References: <20240911143421.85612-1-faresx@amazon.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In order to be resilient against cross-process speculation-based attacks, it makes sense to store certain (secret) items in kernel memory local to mm. Implement such allocations on top of secretmem infrastructure. Specifically, on allocate 1. Create secretmem file. 2. To distinguish it from the conventional memfd_secret()-created one and to maintain associated mm-local allocation context, put the latter on ->private_data of the file. 3. Create virtual mapping in user virtual address space using mmap(). 4. Seal the virtual mapping to disallow the user from affecting it in any way. 5. Fault the pages in, effectively calling secretmem fault handler to remove the pages from kernel linear address and make them local to process mm. 6. Change the PTE from user mode to kernel mode, any access from userspace will result in segmentation fault. Kernel can access this virtual address now. 7. Return the secure area as a struct containing the pointer to the actual memory and providing the context for the release function later. On release, - if called while mm is still in use, remove the mapping - otherwise, if performed at mm teardown, no unmapping is necessary The rest is taken care of by secretmem file cleanup, including returning the pages to the kernel direct map. Signed-off-by: Fares Mehanna Signed-off-by: Roman Kagan --- include/linux/secretmem.h | 29 ++++++ mm/Kconfig | 10 ++ mm/gup.c | 4 +- mm/secretmem.c | 213 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 254 insertions(+), 2 deletions(-) diff --git a/include/linux/secretmem.h b/include/linux/secretmem.h index e918f96881f5..39cc73a0e4bd 100644 --- a/include/linux/secretmem.h +++ b/include/linux/secretmem.h @@ -2,6 +2,10 @@ #ifndef _LINUX_SECRETMEM_H #define _LINUX_SECRETMEM_H =20 +struct secretmem_area { + void *ptr; +}; + #ifdef CONFIG_SECRETMEM =20 extern const struct address_space_operations secretmem_aops; @@ -33,4 +37,29 @@ static inline bool secretmem_active(void) =20 #endif /* CONFIG_SECRETMEM */ =20 +#ifdef CONFIG_KERNEL_SECRETMEM + +bool can_access_secretmem_vma(struct vm_area_struct *vma); +struct secretmem_area *secretmem_allocate_pages(unsigned int order); +void secretmem_release_pages(struct secretmem_area *data); + +#else + +static inline bool can_access_secretmem_vma(struct vm_area_struct *vma) +{ + return true; +} + +static inline struct secretmem_area *secretmem_allocate_pages(unsigned int= order) +{ + return NULL; +} + +static inline void secretmem_release_pages(struct secretmem_area *data) +{ + WARN_ONCE(1, "Called secret memory release page without support\n"); +} + +#endif /* CONFIG_KERNEL_SECRETMEM */ + #endif /* _LINUX_SECRETMEM_H */ diff --git a/mm/Kconfig b/mm/Kconfig index b72e7d040f78..a327d8def179 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1168,6 +1168,16 @@ config SECRETMEM memory areas visible only in the context of the owning process and not mapped to other processes and other kernel page tables. =20 +config KERNEL_SECRETMEM + default y + bool "Enable kernel usage of memfd_secret()" if EXPERT + depends on SECRETMEM + depends on MMU + help + Enable the kernel usage of memfd_secret() for kernel memory allocations, + The allocated memory is visible only to the kernel in the context of + the owning process. + config ANON_VMA_NAME bool "Anonymous VMA name support" depends on PROC_FS && ADVISE_SYSCALLS && MMU diff --git a/mm/gup.c b/mm/gup.c index 54d0dc3831fb..6c2c6a0cbe2a 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1076,7 +1076,7 @@ struct page *follow_page(struct vm_area_struct *vma, = unsigned long address, struct follow_page_context ctx =3D { NULL }; struct page *page; =20 - if (vma_is_secretmem(vma)) + if (!can_access_secretmem_vma(vma)) return NULL; =20 if (WARN_ON_ONCE(foll_flags & FOLL_PIN)) @@ -1281,7 +1281,7 @@ static int check_vma_flags(struct vm_area_struct *vma= , unsigned long gup_flags) if ((gup_flags & FOLL_LONGTERM) && vma_is_fsdax(vma)) return -EOPNOTSUPP; =20 - if (vma_is_secretmem(vma)) + if (!can_access_secretmem_vma(vma)) return -EFAULT; =20 if (write) { diff --git a/mm/secretmem.c b/mm/secretmem.c index 3afb5ad701e1..86afedc65889 100644 --- a/mm/secretmem.c +++ b/mm/secretmem.c @@ -13,13 +13,17 @@ #include #include #include +#include #include #include #include #include #include +#include =20 +#include #include +#include =20 #include =20 @@ -42,6 +46,16 @@ MODULE_PARM_DESC(secretmem_enable, =20 static atomic_t secretmem_users; =20 +/* secretmem file private context */ +struct secretmem_ctx { + struct secretmem_area _area; + struct page **_pages; + unsigned long _nr_pages; + struct file *_file; + struct mm_struct *_mm; +}; + + bool secretmem_active(void) { return !!atomic_read(&secretmem_users); @@ -116,6 +130,7 @@ static const struct vm_operations_struct secretmem_vm_o= ps =3D { =20 static int secretmem_release(struct inode *inode, struct file *file) { + kfree(file->private_data); atomic_dec(&secretmem_users); return 0; } @@ -123,13 +138,23 @@ static int secretmem_release(struct inode *inode, str= uct file *file) static int secretmem_mmap(struct file *file, struct vm_area_struct *vma) { unsigned long len =3D vma->vm_end - vma->vm_start; + struct secretmem_ctx *ctx =3D file->private_data; + unsigned long kernel_no_permissions; + + kernel_no_permissions =3D (VM_READ | VM_WRITE | VM_EXEC | VM_MAYEXEC); =20 if ((vma->vm_flags & (VM_SHARED | VM_MAYSHARE)) =3D=3D 0) return -EINVAL; =20 + if (ctx && (vma->vm_flags & kernel_no_permissions)) + return -EINVAL; + if (!mlock_future_ok(vma->vm_mm, vma->vm_flags | VM_LOCKED, len)) return -EAGAIN; =20 + if (ctx) + vm_flags_set(vma, VM_MIXEDMAP); + vm_flags_set(vma, VM_LOCKED | VM_DONTDUMP); vma->vm_ops =3D &secretmem_vm_ops; =20 @@ -230,6 +255,194 @@ static struct file *secretmem_file_create(unsigned lo= ng flags) return file; } =20 +#ifdef CONFIG_KERNEL_SECRETMEM + +struct secretmem_area *secretmem_allocate_pages(unsigned int order) +{ + unsigned long uvaddr, uvaddr_inc, unused, nr_pages, bytes_length; + struct file *kernel_secfile; + struct vm_area_struct *vma; + struct secretmem_ctx *ctx; + struct page **sec_pages; + struct mm_struct *mm; + long nr_pinned_pages; + pte_t pte, old_pte; + spinlock_t *ptl; + pte_t *upte; + int rc; + + nr_pages =3D (1 << order); + bytes_length =3D nr_pages * PAGE_SIZE; + mm =3D current->mm; + + if (!mm || !mmget_not_zero(mm)) + return NULL; + + /* Create secret memory file / truncate it */ + kernel_secfile =3D secretmem_file_create(0); + if (IS_ERR(kernel_secfile)) + goto put_mm; + + ctx =3D kzalloc(sizeof(*ctx), GFP_KERNEL); + if (IS_ERR(ctx)) + goto close_secfile; + kernel_secfile->private_data =3D ctx; + + rc =3D do_truncate(file_mnt_idmap(kernel_secfile), + file_dentry(kernel_secfile), bytes_length, 0, NULL); + if (rc) + goto close_secfile; + + if (mmap_write_lock_killable(mm)) + goto close_secfile; + + /* Map pages to the secretmem file */ + uvaddr =3D do_mmap(kernel_secfile, 0, bytes_length, PROT_NONE, + MAP_SHARED, 0, 0, &unused, NULL); + if (IS_ERR_VALUE(uvaddr)) + goto unlock_mmap; + + /* mseal() the VMA to make sure it won't change */ + rc =3D do_mseal(uvaddr, uvaddr + bytes_length, true); + if (rc) + goto unmap_pages; + + /* Make sure VMA is there, and is kernel-secure */ + vma =3D find_vma(current->mm, uvaddr); + if (!vma) + goto unseal_vma; + + if (!vma_is_secretmem(vma) || + !can_access_secretmem_vma(vma)) + goto unseal_vma; + + /* Pin user pages; fault them in */ + sec_pages =3D kzalloc(sizeof(struct page *) * nr_pages, GFP_KERNEL); + if (!sec_pages) + goto unseal_vma; + + nr_pinned_pages =3D pin_user_pages(uvaddr, nr_pages, FOLL_FORCE | FOLL_LO= NGTERM, sec_pages); + if (nr_pinned_pages < 0) + goto free_sec_pages; + if (nr_pinned_pages !=3D nr_pages) + goto unpin_pages; + + /* Modify the existing mapping to be kernel accessible, local to this pro= cess mm */ + uvaddr_inc =3D uvaddr; + while (uvaddr_inc < uvaddr + bytes_length) { + upte =3D get_locked_pte(mm, uvaddr_inc, &ptl); + if (!upte) + goto unpin_pages; + old_pte =3D ptep_modify_prot_start(vma, uvaddr_inc, upte); + pte =3D pte_modify(old_pte, PAGE_KERNEL); + ptep_modify_prot_commit(vma, uvaddr_inc, upte, old_pte, pte); + pte_unmap_unlock(upte, ptl); + uvaddr_inc +=3D PAGE_SIZE; + } + flush_tlb_range(vma, uvaddr, uvaddr + bytes_length); + + /* Return data */ + mmgrab(mm); + ctx->_area.ptr =3D (void *) uvaddr; + ctx->_pages =3D sec_pages; + ctx->_nr_pages =3D nr_pages; + ctx->_mm =3D mm; + ctx->_file =3D kernel_secfile; + + mmap_write_unlock(mm); + mmput(mm); + + return &ctx->_area; + +unpin_pages: + unpin_user_pages(sec_pages, nr_pinned_pages); +free_sec_pages: + kfree(sec_pages); +unseal_vma: + rc =3D do_mseal(uvaddr, uvaddr + bytes_length, false); + if (rc) + BUG(); +unmap_pages: + rc =3D do_munmap(mm, uvaddr, bytes_length, NULL); + if (rc) + BUG(); +unlock_mmap: + mmap_write_unlock(mm); +close_secfile: + fput(kernel_secfile); +put_mm: + mmput(mm); + return NULL; +} + +void secretmem_release_pages(struct secretmem_area *data) +{ + unsigned long uvaddr, bytes_length; + struct secretmem_ctx *ctx; + int rc; + + if (!data || !data->ptr) + BUG(); + + ctx =3D container_of(data, struct secretmem_ctx, _area); + if (!ctx || !ctx->_file || !ctx->_pages || !ctx->_mm) + BUG(); + + bytes_length =3D ctx->_nr_pages * PAGE_SIZE; + uvaddr =3D (unsigned long) data->ptr; + + /* + * Remove the mapping if mm is still in use. + * Not secure to continue if unmapping failed. + */ + if (mmget_not_zero(ctx->_mm)) { + mmap_write_lock(ctx->_mm); + rc =3D do_mseal(uvaddr, uvaddr + bytes_length, false); + if (rc) { + mmap_write_unlock(ctx->_mm); + BUG(); + } + rc =3D do_munmap(ctx->_mm, uvaddr, bytes_length, NULL); + if (rc) { + mmap_write_unlock(ctx->_mm); + BUG(); + } + mmap_write_unlock(ctx->_mm); + mmput(ctx->_mm); + } + + mmdrop(ctx->_mm); + unpin_user_pages(ctx->_pages, ctx->_nr_pages); + fput(ctx->_file); + kfree(ctx->_pages); + + ctx->_nr_pages =3D 0; + ctx->_pages =3D NULL; + ctx->_file =3D NULL; + ctx->_mm =3D NULL; + ctx->_area.ptr =3D NULL; +} + +bool can_access_secretmem_vma(struct vm_area_struct *vma) +{ + struct secretmem_ctx *ctx; + + if (!vma_is_secretmem(vma)) + return true; + + /* + * If VMA is owned by running process, and marked for kernel + * usage, then allow access. + */ + ctx =3D vma->vm_file->private_data; + if (ctx && current->mm =3D=3D vma->vm_mm) + return true; + + return false; +} + +#endif /* CONFIG_KERNEL_SECRETMEM */ + SYSCALL_DEFINE1(memfd_secret, unsigned int, flags) { struct file *file; --=20 2.40.1 Amazon Web Services Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 257764 B Sitz: Berlin Ust-ID: DE 365 538 597