Re: [PATCH OLK-5.10 V2 12/44] x86/sgx: Add SGX_IOC_ENCLAVE_ADD_PAGES

Reviewed-by: Bamvor Zhang bamvor.zhang@suse.com

在 2/15/22 11:05 AM, Laibin Qiu 写道:

From: Jarkko Sakkinen jarkko@kernel.org

mainline inclusion from mainline-v5.11-rc1 commit c6d26d370767fa227fc44b98a8bdad112efdf563 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4SIGI CVE: NA

---

SGX enclave pages are inaccessible to normal software. They must be populated with data by copying from normal memory with the help of the EADD and EEXTEND functions of the ENCLS instruction.

Add an ioctl() which performs EADD that adds new data to an enclave, and optionally EEXTEND functions that hash the page contents and use the hash as part of enclave “measurement” to ensure enclave integrity.

The enclave author gets to decide which pages will be included in the enclave measurement with EEXTEND. Measurement is very slow and has sometimes has very little value. For instance, an enclave _could_ measure every page of data and code, but would be slow to initialize. Or, it might just measure its code and then trust that code to initialize the bulk of its data after it starts running.

Intel-SIG: commit c6d26d370767 x86/sgx: Add SGX_IOC_ENCLAVE_ADD_PAGES Backport for SGX Foundations support

Co-developed-by: Sean Christopherson sean.j.christopherson@intel.com Signed-off-by: Sean Christopherson sean.j.christopherson@intel.com Signed-off-by: Jarkko Sakkinen jarkko@kernel.org Signed-off-by: Borislav Petkov bp@suse.de Tested-by: Jethro Beekman jethro@fortanix.com Link: https://lkml.kernel.org/r/20201112220135.165028-14-jarkko@kernel.org Signed-off-by: Fan Du fan.du@intel.com #openEuler_contributor Signed-off-by: Laibin Qiu qiulaibin@huawei.com

---

arch/x86/include/uapi/asm/sgx.h | 30 ++++ arch/x86/kernel/cpu/sgx/ioctl.c | 284 ++++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/sgx/sgx.h | 1 + 3 files changed, 315 insertions(+)

diff --git a/arch/x86/include/uapi/asm/sgx.h b/arch/x86/include/uapi/asm/sgx.h index f31bb17e27c3..835f7e588f0d 100644 --- a/arch/x86/include/uapi/asm/sgx.h +++ b/arch/x86/include/uapi/asm/sgx.h @@ -8,10 +8,21 @@ #include <linux/types.h> #include <linux/ioctl.h>

+/**

• • enum sgx_epage_flags - page control flags
• • %SGX_PAGE_MEASURE: Measure the page contents with a sequence of

• • 	ENCLS[EEXTEND] operations.
    

• */

+enum sgx_page_flags {

• SGX_PAGE_MEASURE = 0x01,

+};

• #define SGX_MAGIC 0xA4

  #define SGX_IOC_ENCLAVE_CREATE \ _IOW(SGX_MAGIC, 0x00, struct sgx_enclave_create)

+#define SGX_IOC_ENCLAVE_ADD_PAGES \

• _IOWR(SGX_MAGIC, 0x01, struct sgx_enclave_add_pages)

  /**

  • struct sgx_enclave_create - parameter structure for the

@@ -22,4 +33,23 @@ struct sgx_enclave_create { __u64 src; };

+/**

• • struct sgx_enclave_add_pages - parameter structure for the

• •                            %SGX_IOC_ENCLAVE_ADD_PAGE ioctl
    

• • @src: start address for the page data
• • @offset: starting page offset
• • @length: length of the data (multiple of the page size)
• • @secinfo: address for the SECINFO data
• • @flags: page control flags
• • @count: number of bytes added (multiple of the page size)
• */

+struct sgx_enclave_add_pages {

• __u64 src;
• __u64 offset;
• __u64 length;
• __u64 secinfo;
• __u64 flags;
• __u64 count;

+};

• #endif /* _UAPI_ASM_X86_SGX_H */

diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c index 1355490843d1..82acff7bda60 100644 --- a/arch/x86/kernel/cpu/sgx/ioctl.c +++ b/arch/x86/kernel/cpu/sgx/ioctl.c @@ -101,6 +101,287 @@ static long sgx_ioc_enclave_create(struct sgx_encl *encl, void __user *arg) return ret; }

+static struct sgx_encl_page *sgx_encl_page_alloc(struct sgx_encl *encl,

• 				 unsigned long offset,
  

• 				 u64 secinfo_flags)
  

+{

• struct sgx_encl_page *encl_page;
• unsigned long prot;
• encl_page = kzalloc(sizeof(*encl_page), GFP_KERNEL);
• if (!encl_page)

• return ERR_PTR(-ENOMEM);
  

• encl_page->desc = encl->base + offset;
• encl_page->encl = encl;
• prot = _calc_vm_trans(secinfo_flags, SGX_SECINFO_R, PROT_READ) |

•       _calc_vm_trans(secinfo_flags, SGX_SECINFO_W, PROT_WRITE) |
  

•       _calc_vm_trans(secinfo_flags, SGX_SECINFO_X, PROT_EXEC);
  

• /*

• * TCS pages must always RW set for CPU access while the SECINFO
  

• * permissions are *always* zero - the CPU ignores the user provided
  

• * values and silently overwrites them with zero permissions.
  

• */
  

• if ((secinfo_flags & SGX_SECINFO_PAGE_TYPE_MASK) == SGX_SECINFO_TCS)

• prot |= PROT_READ | PROT_WRITE;
  

• /* Calculate maximum of the VM flags for the page. */
• encl_page->vm_max_prot_bits = calc_vm_prot_bits(prot, 0);
• return encl_page;

+}

+static int sgx_validate_secinfo(struct sgx_secinfo *secinfo) +{

• u64 perm = secinfo->flags & SGX_SECINFO_PERMISSION_MASK;
• u64 pt = secinfo->flags & SGX_SECINFO_PAGE_TYPE_MASK;
• if (pt != SGX_SECINFO_REG && pt != SGX_SECINFO_TCS)

• return -EINVAL;
  

• if ((perm & SGX_SECINFO_W) && !(perm & SGX_SECINFO_R))

• return -EINVAL;
  

• /*

• * CPU will silently overwrite the permissions as zero, which means
  

• * that we need to validate it ourselves.
  

• */
  

• if (pt == SGX_SECINFO_TCS && perm)

• return -EINVAL;
  

• if (secinfo->flags & SGX_SECINFO_RESERVED_MASK)

• return -EINVAL;
  

• if (memchr_inv(secinfo->reserved, 0, sizeof(secinfo->reserved)))

• return -EINVAL;
  

• return 0;

+}

+static int __sgx_encl_add_page(struct sgx_encl *encl,

• 	       struct sgx_encl_page *encl_page,
  

• 	       struct sgx_epc_page *epc_page,
  

• 	       struct sgx_secinfo *secinfo, unsigned long src)
  

+{

• struct sgx_pageinfo pginfo;
• struct vm_area_struct *vma;
• struct page *src_page;
• int ret;
• /* Deny noexec. */
• vma = find_vma(current->mm, src);
• if (!vma)

• return -EFAULT;
  

• if (!(vma->vm_flags & VM_MAYEXEC))

• return -EACCES;
  

• ret = get_user_pages(src, 1, 0, &src_page, NULL);
• if (ret < 1)

• return -EFAULT;
  

• pginfo.secs = (unsigned long)sgx_get_epc_virt_addr(encl->secs.epc_page);
• pginfo.addr = encl_page->desc & PAGE_MASK;
• pginfo.metadata = (unsigned long)secinfo;
• pginfo.contents = (unsigned long)kmap_atomic(src_page);
• ret = __eadd(&pginfo, sgx_get_epc_virt_addr(epc_page));
• kunmap_atomic((void *)pginfo.contents);
• put_page(src_page);
• return ret ? -EIO : 0;

+}

+/*

• • If the caller requires measurement of the page as a proof for the content,
• • use EEXTEND to add a measurement for 256 bytes of the page. Repeat this
• • operation until the entire page is measured."
• */

+static int __sgx_encl_extend(struct sgx_encl *encl,

• 	     struct sgx_epc_page *epc_page)
  

+{

• unsigned long offset;
• int ret;
• for (offset = 0; offset < PAGE_SIZE; offset += SGX_EEXTEND_BLOCK_SIZE) {

• ret = __eextend(sgx_get_epc_virt_addr(encl->secs.epc_page),
  

• 		sgx_get_epc_virt_addr(epc_page) + offset);
  

• if (ret) {
  

• 	if (encls_failed(ret))
  

• 		ENCLS_WARN(ret, "EEXTEND");
  

• 	return -EIO;
  

• }
  

• }
• return 0;

+}

+static int sgx_encl_add_page(struct sgx_encl *encl, unsigned long src,

• 	     unsigned long offset, struct sgx_secinfo *secinfo,
  

• 	     unsigned long flags)
  

+{

• struct sgx_encl_page *encl_page;
• struct sgx_epc_page *epc_page;
• int ret;
• encl_page = sgx_encl_page_alloc(encl, offset, secinfo->flags);
• if (IS_ERR(encl_page))

• return PTR_ERR(encl_page);
  

• epc_page = __sgx_alloc_epc_page();
• if (IS_ERR(epc_page)) {

• kfree(encl_page);
  

• return PTR_ERR(epc_page);
  

• }
• mmap_read_lock(current->mm);
• mutex_lock(&encl->lock);
• /*

• * Insert prior to EADD in case of OOM.  EADD modifies MRENCLAVE, i.e.
  

• * can't be gracefully unwound, while failure on EADD/EXTEND is limited
  

• * to userspace errors (or kernel/hardware bugs).
  

• */
  

• ret = xa_insert(&encl->page_array, PFN_DOWN(encl_page->desc),

• 	encl_page, GFP_KERNEL);
  

• if (ret)

• goto err_out_unlock;
  

• ret = __sgx_encl_add_page(encl, encl_page, epc_page, secinfo,

• 		  src);
  

• if (ret)

• goto err_out;
  

• /*

• * Complete the "add" before doing the "extend" so that the "add"
  

• * isn't in a half-baked state in the extremely unlikely scenario
  

• * the enclave will be destroyed in response to EEXTEND failure.
  

• */
  

• encl_page->encl = encl;
• encl_page->epc_page = epc_page;
• encl->secs_child_cnt++;
• if (flags & SGX_PAGE_MEASURE) {

• ret = __sgx_encl_extend(encl, epc_page);
  

• if (ret)
  

• 	goto err_out;
  

• }
• mutex_unlock(&encl->lock);
• mmap_read_unlock(current->mm);
• return ret;

+err_out:

• xa_erase(&encl->page_array, PFN_DOWN(encl_page->desc));

+err_out_unlock:

• mutex_unlock(&encl->lock);
• mmap_read_unlock(current->mm);
• sgx_free_epc_page(epc_page);
• kfree(encl_page);
• return ret;

+}

+/**

• • sgx_ioc_enclave_add_pages() - The handler for %SGX_IOC_ENCLAVE_ADD_PAGES
• • @encl: an enclave pointer
• • @arg: a user pointer to a struct sgx_enclave_add_pages instance
• • Add one or more pages to an uninitialized enclave, and optionally extend the
• • measurement with the contents of the page. The SECINFO and measurement mask
• • are applied to all pages.
• • A SECINFO for a TCS is required to always contain zero permissions because
• • CPU silently zeros them. Allowing anything else would cause a mismatch in
• • the measurement.
• • mmap()'s protection bits are capped by the page permissions. For each page
• • address, the maximum protection bits are computed with the following
• • heuristics:
• • 1. A regular page: PROT_R, PROT_W and PROT_X match the SECINFO permissions.
• • 2. A TCS page: PROT_R | PROT_W.
• • mmap() is not allowed to surpass the minimum of the maximum protection bits
• • within the given address range.
• • The function deinitializes kernel data structures for enclave and returns
• • -EIO in any of the following conditions:
• • • Enclave Page Cache (EPC), the physical memory holding enclaves, has
• • been invalidated. This will cause EADD and EEXTEND to fail.
• • • If the source address is corrupted somehow when executing EADD.
• • Return:
• • • 0: Success.
• • • -EACCES: The source page is located in a noexec partition.
• • • -ENOMEM: Out of EPC pages.
• • • -EINTR: The call was interrupted before data was processed.
• • • -EIO: Either EADD or EEXTEND failed because invalid source address

• • or power cycle.
    

• • • -errno: POSIX error.
• */

+static long sgx_ioc_enclave_add_pages(struct sgx_encl *encl, void __user *arg) +{

• struct sgx_enclave_add_pages add_arg;
• struct sgx_secinfo secinfo;
• unsigned long c;
• int ret;
• if (!test_bit(SGX_ENCL_CREATED, &encl->flags))

• return -EINVAL;
  

• if (copy_from_user(&add_arg, arg, sizeof(add_arg)))

• return -EFAULT;
  

• if (!IS_ALIGNED(add_arg.offset, PAGE_SIZE) ||

•    !IS_ALIGNED(add_arg.src, PAGE_SIZE))
  

• return -EINVAL;
  

• if (add_arg.length & (PAGE_SIZE - 1))

• return -EINVAL;
  

• if (add_arg.offset + add_arg.length - PAGE_SIZE >= encl->size)

• return -EINVAL;
  

• if (copy_from_user(&secinfo, (void __user *)add_arg.secinfo,

• 	   sizeof(secinfo)))
  

• return -EFAULT;
  

• if (sgx_validate_secinfo(&secinfo))

• return -EINVAL;
  

• for (c = 0 ; c < add_arg.length; c += PAGE_SIZE) {

• if (signal_pending(current)) {
  

• 	if (!c)
  

• 		ret = -EINTR;
  

• 	break;
  

• }
  

• if (need_resched())
  

• 	cond_resched();
  

• ret = sgx_encl_add_page(encl, add_arg.src + c, add_arg.offset + c,
  

• 			&secinfo, add_arg.flags);
  

• if (ret)
  

• 	break;
  

• }
• add_arg.count = c;
• if (copy_to_user(arg, &add_arg, sizeof(add_arg)))

• return -EFAULT;
  

• return ret;

+}

• long sgx_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) { struct sgx_encl *encl = filep->private_data;

@@ -113,6 +394,9 @@ long sgx_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) case SGX_IOC_ENCLAVE_CREATE: ret = sgx_ioc_enclave_create(encl, (void __user *)arg); break;

• case SGX_IOC_ENCLAVE_ADD_PAGES:

• ret = sgx_ioc_enclave_add_pages(encl, (void __user *)arg);
  

• break;
  

  default: ret = -ENOIOCTLCMD; break;

diff --git a/arch/x86/kernel/cpu/sgx/sgx.h b/arch/x86/kernel/cpu/sgx/sgx.h index bd9dcb1ffcfa..91234f425b89 100644 --- a/arch/x86/kernel/cpu/sgx/sgx.h +++ b/arch/x86/kernel/cpu/sgx/sgx.h @@ -14,6 +14,7 @@ #define pr_fmt(fmt) "sgx: " fmt

#define SGX_MAX_EPC_SECTIONS 8 +#define SGX_EEXTEND_BLOCK_SIZE 256

struct sgx_epc_page { unsigned int section;