Merge pull request #125 from haitaohuang/master

reset hashes

Author: haitaohuang

.gitignore

@@ -1,6 +1,7 @@
 *.ko
 *.o
 *.cmd
+*.mod
 *.mod.*
 *.symvers
 *.order

Makefile

@@ -23,4 +23,4 @@ install: default
 endif
 
 clean:
-	rm -vrf *.o *.ko *.order *.symvers *.mod.c .tmp_versions .*o.cmd
+	rm -vrf *.o *.ko *.order *.symvers *.mod.c .tmp_versions .*o.cmd *.mod

sgx.h

@@ -79,6 +79,12 @@
 #define SGX_EDMM_SPIN_COUNT	20
 
 #define SGX_VA_SLOT_COUNT 512
+#ifndef MSR_IA32_SGXLEPUBKEYHASH0
+    #define MSR_IA32_SGXLEPUBKEYHASH0	0x0000008C
+    #define MSR_IA32_SGXLEPUBKEYHASH1	0x0000008D
+    #define MSR_IA32_SGXLEPUBKEYHASH2	0x0000008E
+    #define MSR_IA32_SGXLEPUBKEYHASH3	0x0000008F
+#endif
 
 struct sgx_epc_page {
 	resource_size_t	pa;

sgx_main.c

@@ -184,6 +184,15 @@ static int sgx_pm_suspend(struct device *dev)
 	return 0;
 }
 
+static void sgx_reset_pubkey_hash(void *failed)
+{
+	if (wrmsrl_safe(MSR_IA32_SGXLEPUBKEYHASH0, 0xa6053e051270b7acULL) ||
+		wrmsrl_safe(MSR_IA32_SGXLEPUBKEYHASH1, 0x6cfbe8ba8b3b413dULL) ||
+		wrmsrl_safe(MSR_IA32_SGXLEPUBKEYHASH2, 0xc4916d99f2b3735dULL) ||
+		wrmsrl_safe(MSR_IA32_SGXLEPUBKEYHASH3, 0xd4f8c05909f9bb3bULL))
+		*(int *)failed = -EIO;
+}
+
 static SIMPLE_DEV_PM_OPS(sgx_drv_pm, sgx_pm_suspend, NULL);
 
 static int sgx_dev_init(struct device *parent)
@@ -193,6 +202,7 @@ static int sgx_dev_init(struct device *parent)
 	unsigned long size;
 	int ret;
 	int i;
+	int msr_reset_failed = 0;
 
 	pr_info("intel_sgx: " DRV_DESCRIPTION " v" DRV_VERSION "\n");
 
@@ -271,6 +281,11 @@ static int sgx_dev_init(struct device *parent)
 		goto out_workqueue;
 	}
 
+	on_each_cpu(sgx_reset_pubkey_hash, &msr_reset_failed, 1);
+	if (msr_reset_failed) {
+		pr_info("intel_sgx:  can not reset SGX LE public key hash MSRs\n");
+	}
+
 	return 0;
 out_workqueue:
 	destroy_workqueue(sgx_add_page_wq);