From: Keir Fraser Date: Thu, 10 Jan 2008 11:28:03 +0000 (+0000) Subject: xen vtpm: Initialize the comms ring with zeroes. X-Git-Tag: 3.1.3-rc1~31 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2371159634e1adba9175de3749cf81df3e6f937b;p=people%2Fvhanquez%2Fxen.git xen vtpm: Initialize the comms ring with zeroes. Initialize the ring with zeroes on the backend side and on the frontend set the 'unused' member to zeroes. Signed-off-by: Stefan Berger linux-2.6.18-xen changeset: 374:fedc10fba9f1d5ec0c72dbcbca87e508222b4c48 linux-2.6.18-xen date: Tue Jan 08 09:55:29 2008 +0000 --- diff --git a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c index 548821746..32ef6ef1b 100644 --- a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c +++ b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c @@ -618,6 +618,7 @@ static int tpm_xmit(struct tpm_private *tp, tx = &tp->tx->ring[i].req; tx->addr = virt_to_machine(txb->data); tx->size = txb->len; + tx->unused = 0; DPRINTK("First 4 characters sent by TPM-FE are " "0x%02x 0x%02x 0x%02x 0x%02x\n", diff --git a/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c b/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c index 3ae227a01..604f69eb8 100644 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c @@ -126,6 +126,7 @@ int tpmif_map(tpmif_t *tpmif, unsigned long shared_page, unsigned int evtchn) } tpmif->tx = (tpmif_tx_interface_t *)tpmif->tx_area->addr; + memset(tpmif->tx, 0, PAGE_SIZE); err = bind_interdomain_evtchn_to_irqhandler( tpmif->domid, evtchn, tpmif_be_int, 0, tpmif->devname, tpmif);