x86/sgx: Always deregister /dev/sgx_provision on failure
Jarkko Sakkinen
maintainerPATCH 1/1 x86/sgx: Always deregister /dev/sgx_provision on failure
When /dev/sgx_vepc for KVM was added, the initialization was relaxed so that this file can be accessed even when the driver is disabled.
Deregister /dev/sgx_provision when the driver is disabled, because it is only useful for the driver.
--- arch/x86/kernel/cpu/sgx/driver.c | 17 +++++++++++++++++ arch/x86/kernel/cpu/sgx/main.c | 20 +------------------- 2 files changed, 18 insertions(+), 19 deletions(-)
arch/x86/kernel/cpu/sgx/driver.c +17 -0
@@ -143,6 +143,17 @@ static struct miscdevice sgx_dev_enclave = { .fops = &sgx_encl_fops, }; +const struct file_operations sgx_provision_fops = { + .owner =THIS_MODULE , +}; + +static struct miscdevice sgx_dev_provision = { + .minor =MISC_DYNAMIC_MINOR , + .name ="sgx_provision" , + .nodename ="sgx_provision" , + .fops = &sgx_provision_fops, +}; +int __init sgx_drv_init (void ) {unsigned int eax, ebx, ecx, edx;
@@ -176,5 +187,11 @@ int __init sgx_drv_init(void)if (ret)return ret; + ret =misc_register (&sgx_dev_provision); +if (ret) { +misc_deregister (&sgx_dev_enclave); +return ret; + } +return 0 ; }
arch/x86/kernel/cpu/sgx/main.c +1 -19
@@ -745,17 +745,6 @@ void sgx_update_lepubkeyhash(u64 *lepubkeyhash)wrmsrl (MSR_IA32_SGXLEPUBKEYHASH0 + i, lepubkeyhash[i]); } -const struct file_operations sgx_provision_fops = { - .owner =THIS_MODULE , -}; - -static struct miscdevice sgx_dev_provision = { - .minor =MISC_DYNAMIC_MINOR , - .name ="sgx_provision" , - .nodename ="sgx_provision" , - .fops = &sgx_provision_fops, -}; -/** * sgx_set_attribute() - Update allowed attributes given file descriptor * @allowed_attributes: Pointer to allowed enclave attributes
@@ -806,10 +795,6 @@ static int __init sgx_init(void) goto err_page_cache; } - ret =misc_register (&sgx_dev_provision); -if (ret) - goto err_kthread; -/* * Always try to initialize the native *and* KVM drivers. * The KVM driver is less picky than the native one and
@@ -821,13 +806,10 @@ static int __init sgx_init(void) ret =sgx_drv_init ();if (sgx_vepc_init () && ret) - goto err_provision; + goto err_kthread;return 0 ; -err_provision: -misc_deregister (&sgx_dev_provision); - err_kthread:kthread_stop (ksgxd_tsk);
Signature · 1 line
2.32.0
Quoted 5 lines · On Wed, 11 Aug 2021 01:56:27 +0300 Jarkko Sakkinen wrote:
When
/dev/sgx_vepcfor KVM was added, the initialization was relaxed so that this file can be accessed even when the driver is disabled.Deregister
/dev/sgx_provisionwhen the driver is disabled, because it is only useful for the driver.
Hi Jarkko,
This is not true. KVM also uses /dev/sgx_provision to restrict enclave in guest from accessing provisoning key. Specifically, in order to allow guest enclave to be able to use provisioning key, when one VM is created, Qemu must have permission to open /dev/sgx_provision, and pass the fd as parameter to KVM_CAP_SGX_ATTRIBUTE.
Please see below KVM API:
7.25 KVM_CAP_SGX_ATTRIBUTE
--------------------------
:Architectures: x86
:Target: VM
:Parameters: args[0] is a file handle of a SGX attribute file in securityfs :Returns: 0 on success, -EINVAL if the file handle is invalid or if a requested
attribute is not supported by KVM.
KVM_CAP_SGX_ATTRIBUTE enables a userspace VMM to grant a VM access to one or more priveleged enclave attributes. args[0] must hold a file handle to a valid SGX attribute file corresponding to an attribute that is supported/restricted by KVM (currently only PROVISIONKEY).
The SGX subsystem restricts access to a subset of enclave attributes to provide additional security for an uncompromised kernel, e.g. use of the PROVISIONKEY is restricted to deter malware from using the PROVISIONKEY to obtain a stable system fingerprint. To prevent userspace from circumventing such restrictions by running an enclave in a VM, KVM prevents access to privileged attributes by default.
Quoted 93 lines
Fixes faa7d3e6f3b9 ("x86/sgx: Initialize virtual EPC driver even when SGX driver is disabled")Signed-off-by Jarkko Sakkinen <[email protected]>--- arch/x86/kernel/cpu/sgx/driver.c | 17 +++++++++++++++++ arch/x86/kernel/cpu/sgx/main.c | 20 +------------------- 2 files changed, 18 insertions(+), 19 deletions(-)arch/x86/kernel/cpu/sgx/driver.c +17
-0@@ -143,6 +143,17 @@ static struct miscdevice sgx_dev_enclave = { .fops = &sgx_encl_fops, }; +const struct file_operations sgx_provision_fops = { + .owner =THIS_MODULE , +}; + +static struct miscdevice sgx_dev_provision = { + .minor =MISC_DYNAMIC_MINOR , + .name ="sgx_provision" , + .nodename ="sgx_provision" , + .fops = &sgx_provision_fops, +}; +int __init sgx_drv_init (void ) {unsigned int eax, ebx, ecx, edx;@@ -176,5 +187,11 @@ int __init sgx_drv_init(void)if (ret)return ret; + ret =misc_register (&sgx_dev_provision); +if (ret) { +misc_deregister (&sgx_dev_enclave); +return ret; + } +return 0 ; }arch/x86/kernel/cpu/sgx/main.c +1
-19@@ -745,17 +745,6 @@ void sgx_update_lepubkeyhash(u64 *lepubkeyhash)wrmsrl (MSR_IA32_SGXLEPUBKEYHASH0 + i, lepubkeyhash[i]); } -const struct file_operations sgx_provision_fops = { - .owner =THIS_MODULE , -}; - -static struct miscdevice sgx_dev_provision = { - .minor =MISC_DYNAMIC_MINOR , - .name ="sgx_provision" , - .nodename ="sgx_provision" , - .fops = &sgx_provision_fops, -}; -/** * sgx_set_attribute() - Update allowed attributes given file descriptor * @allowed_attributes: Pointer to allowed enclave attributes @@ -806,10 +795,6 @@ static int __init sgx_init(void) goto err_page_cache; } - ret =misc_register (&sgx_dev_provision); -if (ret) - goto err_kthread; -/* * Always try to initialize the native *and* KVM drivers. * The KVM driver is less picky than the native one and @@ -821,13 +806,10 @@ static int __init sgx_init(void) ret =sgx_drv_init ();if (sgx_vepc_init () && ret) - goto err_provision; + goto err_kthread;return 0 ; -err_provision: -misc_deregister (&sgx_dev_provision); - err_kthread:kthread_stop (ksgxd_tsk);Signature · 1 line
2.32.0
Jarkko Sakkinen
maintainerQuoted 31 lines · Kai Huang
Quoted 5 lines · On Wed, 11 Aug 2021 01:56:27 +0300 Jarkko Sakkinen wrote:
When
/dev/sgx_vepcfor KVM was added, the initialization was relaxed so that this file can be accessed even when the driver is disabled.Deregister
/dev/sgx_provisionwhen the driver is disabled, because it is only useful for the driver.Hi Jarkko,
This is not true. KVM also uses
/dev/sgx_provisionto restrict enclave in guest from accessing provisoning key. Specifically, in order to allow guest enclave to be able to use provisioning key, when one VM is created, Qemu must have permission to open/dev/sgx_provision, and pass the fd as parameter toKVM_CAP_SGX_ATTRIBUTE.Please see below KVM API:
7.25
KVM_CAP_SGX_ATTRIBUTE
--------------------------:Architectures: x86
:Target: VM
:Parameters: args[0] is a file handle of a SGX attribute file in securityfs :Returns: 0 on success,-EINVALif the file handle is invalid or if a requested
attribute is not supported by KVM.
KVM_CAP_SGX_ATTRIBUTEenables a userspace VMM to grant a VM access to one or more priveleged enclave attributes. args[0] must hold a file handle to a valid SGX attribute file corresponding to an attribute that is supported/restricted by KVM (currently only PROVISIONKEY).
Quoted 6 lines
The SGX subsystem restricts access to a subset of enclave attributes to provide additional security for an uncompromised kernel, e.g. use of the PROVISIONKEY is restricted to deter malware from using the PROVISIONKEY to obtain a stable system fingerprint. To prevent userspace from circumventing such restrictions by running an enclave in a VM, KVM prevents access to privileged attributes by default.
OK, I was not aware of this.
/Jarkko