[Xen-changelog] [xen-unstable] vtpm: Fix GetCapabilityOwner function

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1198950754 0
# Node ID 688e9186eed4a882843f108ac5b59ca68ba8b69e
# Parent  ad0f20f5590a7ddabd94662a9f251e1d4a2f058f
vtpm: Fix GetCapabilityOwner function

GetCapabilityOwner function's behavior is different from that of a
real tpm device. By the difference, a TPM Manager in an HVM domain
could not detect whether TPM device has an owner or not.

Signed-off-by: Kouichi YASAKI <yasaki.kouichi@xxxxxxxxxxxxxx>
---
 tools/vtpm/tpm_emulator.patch |   10 ++++++++++
 1 files changed, 10 insertions(+)

diff -r ad0f20f5590a -r 688e9186eed4 tools/vtpm/tpm_emulator.patch
--- a/tools/vtpm/tpm_emulator.patch     Fri Dec 28 15:44:51 2007 +0000
+++ b/tools/vtpm/tpm_emulator.patch     Sat Dec 29 17:52:34 2007 +0000
@@ -547,6 +547,21 @@ diff -uprN orig/tpm_emulator-0.4/README 
  Installation
  --------------------------------------------------------------------------
  The compilation and installation process uses the build environment for 
+diff -uprN orig/tpm_emulator-0.4/tpm/tpm_capability.c 
tpm_emulator/tpm/tpm_capability.c
+--- orig/tpm_emulator-0.4/tpm/tpm_capability.c 2006-06-23 19:37:07.000000000 
+0900
++++ tpm_emulator/tpm/tpm_capability.c  2007-12-28 22:50:19.000000000 +0900
+@@ -701,7 +701,10 @@ TPM_RESULT TPM_GetCapabilityOwner(TPM_VE
+   TPM_RESULT res;
+   
+   info("TPM_GetCapabilityOwner()");
+-  
++ 
++  if (!tpmData.permanent.flags.owned) {
++    return TPM_NOSRK;
++  } 
+   /* Verify owner authorization */
+   res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, 
TPM_KH_OWNER);
+   if (res != TPM_SUCCESS) return res;
 diff -uprN orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c 
tpm_emulator/tpm/tpm_cmd_handler.c
 --- orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c        2006-06-23 
19:37:07.000000000 +0900
 +++ tpm_emulator/tpm/tpm_cmd_handler.c 2007-09-12 20:23:00.000000000 +0900

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog