Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49afd728 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen Committed by Peter Huewe
Browse files

tpm, tpm_crb: fix le64_to_cpu conversions in crb_acpi_add() 



le64_to_cpu() was applied twice to the physical addresses read from the
control area. This hasn't shown any visible regressions because CRB
driver has been tested only on the little endian platofrms so far.

Reported-by: default avatarMatt Fleming <matt.fleming@intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-By: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Cc: <stable@vger.kernel.org>
Fixes: 30fc8d13 ("tpm: TPM 2.0 CRB Interface")
Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
parent 9d75f089

drivers/char/tpm/tpm_crb.c

+2 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static int crb_acpi_add(struct acpi_device *device) 


	memcpy_fromio(&pa, &priv->cca->cmd_pa, 8);

	pa = le64_to_cpu(pa);

	priv->cmd = devm_ioremap_nocache(dev, le64_to_cpu(pa),

	priv->cmd = devm_ioremap_nocache(dev, pa,

					 ioread32(&priv->cca->cmd_size));

	if (!priv->cmd) {

		dev_err(dev, "ioremap of the command buffer failed\n");
@@ -276,7 +276,7 @@ static int crb_acpi_add(struct acpi_device *device) 


	memcpy_fromio(&pa, &priv->cca->rsp_pa, 8);

	pa = le64_to_cpu(pa);

	priv->rsp = devm_ioremap_nocache(dev, le64_to_cpu(pa),

	priv->rsp = devm_ioremap_nocache(dev, pa,

					 ioread32(&priv->cca->rsp_size));

	if (!priv->rsp) {

		dev_err(dev, "ioremap of the response buffer failed\n");