upstream/oracle/userland-gate: components/trousers/patches/tcs_tcs

author	Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
	Sat, 20 Oct 2012 00:06:08 -0700
branch	s11-sru
changeset 2391	811524a2620b
parent 399	components/trousers/patches/tcs_caps.c.patch@d877cc559d95
permissions	-rw-r--r--

7123028 Problem with crypto/tss 7041927 tcsd and libtspi should not use TCP/IP sockets 7002966 libtspi can segv in .fini section 6896514 tss code doesn't do correct privilege check when using mlock 7162897 tcsd daemon goes into maintenance mode after reboot


--- src/tcs/tcs_caps.c.old	Wed Jun  9 13:20:44 2010
+++ src/tcs/tcs_caps.c	Fri Jul  1 16:26:51 2011
@@ -149,6 +149,7 @@
 {
 	TSS_RESULT result;
 	UINT32 subCap, rv = 0;
+	UINT32 manuf;
 
 	if ((result = get_current_version(&p->version)))
 		goto err;
@@ -181,8 +182,9 @@
 
 	UINT32ToArray(TPM_CAP_PROP_MANUFACTURER, (BYTE *)&subCap);
 	if ((result = get_cap_uint32(TCPA_CAP_PROPERTY, (BYTE *)&subCap, sizeof(UINT32),
-					(UINT32 *)&p->manufacturer)))
+					(UINT32 *)&manuf)))
 		goto err;
+	(void) memcpy(p->manufacturer, &manuf, sizeof (UINT32));
 
 	result = get_max_auths(&(p->num_auths));