| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20210315170828.3385a9b66191e2bf47a1766e@intel.com>
Date: Mon, 15 Mar 2021 17:08:28 +1300
From: Kai Huang <kai.huang@...el.com>
To: Kai Huang <kai.huang@...el.com>
Cc: <kvm@...r.kernel.org>, <linux-sgx@...r.kernel.org>,
<x86@...nel.org>, <linux-kernel@...r.kernel.org>,
<seanjc@...gle.com>, <jarkko@...nel.org>, <luto@...nel.org>,
<dave.hansen@...el.com>, <rick.p.edgecombe@...el.com>,
<haitao.huang@...el.com>, <pbonzini@...hat.com>, <bp@...en8.de>,
<tglx@...utronix.de>, <mingo@...hat.com>, <hpa@...or.com>
Subject: Re: [PATCH v2 13/25] x86/sgx: Add helpers to expose ECREATE and
EINIT to KVM
On Tue, 9 Mar 2021 14:39:46 +1300 Kai Huang wrote:
> From: Sean Christopherson <sean.j.christopherson@...el.com>
>
> The host kernel must intercept ECREATE to impose policies on guests, and
> intercept EINIT to be able to write guest's virtual SGX_LEPUBKEYHASH MSR
> values to hardware before running guest's EINIT so it can run correctly
> according to hardware behavior.
>
> Provide wrappers around __ecreate() and __einit() to hide the ugliness
> of overloading the ENCLS return value to encode multiple error formats
> in a single int. KVM will trap-and-execute ECREATE and EINIT as part
> of SGX virtualization, and reflect ENCLS execution result to guest by
> setting up guest's GPRs, or on an exception, injecting the correct fault
> based on return value of __ecreate() and __einit().
>
> Use host userspace addresses (provided by KVM based on guest physical
> address of ENCLS parameters) to execute ENCLS/EINIT when possible.
> Accesses to both EPC and memory originating from ENCLS are subject to
> segmentation and paging mechanisms. It's also possible to generate
> kernel mappings for ENCLS parameters by resolving PFN but using
> __uaccess_xx() is simpler.
>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@...el.com>
> Signed-off-by: Kai Huang <kai.huang@...el.com>
> ---
> v1->v2:
>
> - Tried to address Dave's comments:
> - Refined comments around @secs in sgx_virt_ecreate().
> - Refined commit msg to explain why to use userspace address for ENCLS,
> instead of generating kernel mapping.
> - Added access_ok() on userspace addresses, and give WARN() if check fails.
>
> ---
> arch/x86/include/asm/sgx.h | 7 +++
> arch/x86/kernel/cpu/sgx/virt.c | 110 +++++++++++++++++++++++++++++++++
> 2 files changed, 117 insertions(+)
>
> diff --git a/arch/x86/include/asm/sgx.h b/arch/x86/include/asm/sgx.h
> index 0db1e47a90c5..d2e1f9a6dd4d 100644
> --- a/arch/x86/include/asm/sgx.h
> +++ b/arch/x86/include/asm/sgx.h
> @@ -365,4 +365,11 @@ struct sgx_sigstruct {
> * line!
> */
>
> +#ifdef CONFIG_X86_SGX_KVM
> +int sgx_virt_ecreate(struct sgx_pageinfo *pageinfo, void __user *secs,
> + int *trapnr);
> +int sgx_virt_einit(void __user *sigstruct, void __user *token,
> + void __user *secs, u64 *lepubkeyhash, int *trapnr);
> +#endif
> +
> #endif /* _ASM_X86_SGX_H */
> diff --git a/arch/x86/kernel/cpu/sgx/virt.c b/arch/x86/kernel/cpu/sgx/virt.c
> index 29d8d28b4695..ef0a8b39315d 100644
> --- a/arch/x86/kernel/cpu/sgx/virt.c
> +++ b/arch/x86/kernel/cpu/sgx/virt.c
> @@ -258,3 +258,113 @@ int __init sgx_vepc_init(void)
>
> return misc_register(&sgx_vepc_dev);
> }
> +
> +/**
> + * sgx_virt_ecreate() - Run ECREATE on behalf of guest
> + * @pageinfo: Pointer to PAGEINFO structure
> + * @secs: Userspace pointer to SECS page
> + * @trapnr: trap number injected to guest in case of ECREATE error
> + *
> + * Run ECREATE on behalf of guest after KVM traps ECREATE for the purpose
> + * of enforcing policies of guest's enclaves, and return the trap number
> + * which should be injected to guest in case of any ECREATE error.
> + *
> + * Return:
> + * - 0: ECREATE was successful.
> + * - -EFAULT: ECREATE returned error.
> + */
> +int sgx_virt_ecreate(struct sgx_pageinfo *pageinfo, void __user *secs,
> + int *trapnr)
> +{
> + int ret;
> +
> + /*
> + * @secs is an untrusted, userspace-provided address. It comes from
> + * KVM and is assumed to be a valid pointer which points somewhere in
> + * userspace. This can fault and call SGX or other fault handlers when
> + * userspace mapping @secs doesn't exist.
> + *
> + * Add a WARN() to make sure @secs is already valid userspace pointer
> + * from caller (KVM), who should already have handled invalid pointer
> + * case (for instance, made by malicious guest). All other checks,
> + * such as alignment of @secs, are deferred to ENCLS itself.
> + */
> + WARN_ON_ONCE(!access_ok(PTR_ALIGN_DOWN(secs, PAGE_SIZE), PAGE_SIZE));
> + __uaccess_begin();
> + ret = __ecreate(pageinfo, (void *)secs);
> + __uaccess_end();
> +
> + if (encls_faulted(ret)) {
> + *trapnr = ENCLS_TRAPNR(ret);
> + return -EFAULT;
> + }
> +
> + /* ECREATE doesn't return an error code, it faults or succeeds. */
> + WARN_ON_ONCE(ret);
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(sgx_virt_ecreate);
> +
> +static int __sgx_virt_einit(void __user *sigstruct, void __user *token,
> + void __user *secs)
> +{
> + int ret;
> +
> + /*
> + * Make sure all userspace pointers from caller (KVM) are valid.
> + * All other checks deferred to ENCLS itself. Also see comment
> + * for @secs in sgx_virt_ecreate().
> + */
> + WARN_ON_ONCE(!access_ok(PTR_ALIGN_DOWN(sigstruct, PAGE_SIZE),
> + PAGE_SIZE) ||
> + !access_ok(PTR_ALIGN_DOWN(token, PAGE_SIZE), PAGE_SIZE) ||
> + !access_ok(PTR_ALIGN_DOWN(secs, PAGE_SIZE), PAGE_SIZE));
I think I was overthinking about those access_ok()s. The align down is not
needed, and size should just be the size of the structures. I'll change in next
version.
One thing is SGX driver doesn't use EINITTOKEN, so it doesn't have 'struct
sgx_einittoken {}' defined. The size of EINITTOKEN is fixed size (304 bytes),
so I will add a macro definition SGX_EINITTOKEN_SIZE and use it.
Hi Sean, please let me know if you have any comments here (and this patch).
Thanks!
> + __uaccess_begin();
> + ret = __einit((void *)sigstruct, (void *)token, (void *)secs);
> + __uaccess_end();
> +
> + return ret;
> +}
> +
> +/**
> + * sgx_virt_einit() - Run EINIT on behalf of guest
> + * @sigstruct: Userspace pointer to SIGSTRUCT structure
> + * @token: Userspace pointer to EINITTOKEN structure
> + * @secs: Userspace pointer to SECS page
> + * @lepubkeyhash: Pointer to guest's *virtual* SGX_LEPUBKEYHASH MSR
> + * values
> + * @trapnr: trap number injected to guest in case of EINIT error
> + *
> + * Run EINIT on behalf of guest after KVM traps EINIT. If SGX_LC is available
> + * in host, SGX driver may rewrite the hardware values at wish, therefore KVM
> + * needs to update hardware values to guest's virtual MSR values in order to
> + * ensure EINIT is executed with expected hardware values.
> + *
> + * Return:
> + * - 0: EINIT was successful.
> + * - -EFAULT: EINIT returned error.
> + */
> +int sgx_virt_einit(void __user *sigstruct, void __user *token,
> + void __user *secs, u64 *lepubkeyhash, int *trapnr)
> +{
> + int ret;
> +
> + if (!boot_cpu_has(X86_FEATURE_SGX_LC)) {
> + ret = __sgx_virt_einit(sigstruct, token, secs);
> + } else {
> + preempt_disable();
> +
> + sgx_update_lepubkeyhash(lepubkeyhash);
> +
> + ret = __sgx_virt_einit(sigstruct, token, secs);
> + preempt_enable();
> + }
> +
> + if (encls_faulted(ret)) {
> + *trapnr = ENCLS_TRAPNR(ret);
> + return -EFAULT;
> + }
> +
> + return ret;
> +}
> +EXPORT_SYMBOL_GPL(sgx_virt_einit);
> --
> 2.29.2
>
Powered by blists - more mailing lists