linux-stable.git/drivers/char/tpm, branch v4.0

tpm: fix call order in tpm-chip.c

2015-03-06T21:35:49+00:00

- tpm_dev_add_device(): cdev_add() must be done before uevent is
  propagated in order to avoid races.
- tpm_chip_register(): tpm_dev_add_device() must be done as the
  last step before exposing device to the user space in order to
  avoid races.

In addition clarified description in tpm_chip_register().

Fixes: 313d21eeab92 ("tpm: device class for tpm")
Fixes: afb5abc262e9 ("tpm: two-phase chip management functions")

Signed-off-by: Jarkko Sakkinen 
Reviewed-by: Peter Huewe 
Signed-off-by: Peter Huewe

tpm/ibmvtpm: Additional LE support for tpm_ibmvtpm_send

2015-03-06T21:35:48+00:00

Problem: When IMA and VTPM are both enabled in kernel config,
kernel hangs during bootup on LE OS.

Why?: IMA calls tpm_pcr_read() which results in tpm_ibmvtpm_send
and tpm_ibmtpm_recv getting called. A trace showed that
tpm_ibmtpm_recv was hanging.

Resolution: tpm_ibmtpm_recv was hanging because tpm_ibmvtpm_send
was sending CRQ message that probably did not make much sense
to phype because of Endianness. The fix below sends correctly
converted CRQ for LE. This was not caught before because it
seems IMA is not enabled by default in kernel config and
IMA exercises this particular code path in vtpm.

Tested with IMA and VTPM enabled in kernel config and VTPM
enabled on both a BE OS and a LE OS ppc64 lpar. This exercised
CRQ and TPM command code paths in vtpm.
Patch is against Peter's tpmdd tree on github which included
Vicky's previous vtpm le patches.

Signed-off-by: Joy Latten 
Cc:  # eb71f8a5e33f: "Added Little Endian support to vtpm module"
Cc: 
Reviewed-by: Ashley Lai 
Signed-off-by: Peter Huewe

Added Little Endian support to vtpm module

2015-02-15T16:36:05+00:00

The tpm_ibmvtpm module is affected by an unaligned access problem.
ibmvtpm_crq_get_version failed with rc=-4 during boot when vTPM is
enabled in Power partition, which supports both little endian and
big endian modes.

We added little endian support to fix this problem:
1) added cpu_to_be64 calls to ensure BE data is sent from an LE OS.
2) added be16_to_cpu and be32_to_cpu calls to make sure data received
   is in LE format on a LE OS.

Signed-off-by: Hon Ching(Vicky) Lo 
Signed-off-by: Joy Latten 
Cc: 
[phuewe: manually applied the patch :( ]
Reviewed-by: Ashley Lai 
Signed-off-by: Peter Huewe

tpm, tpm_tis: fix TPM 2.0 probing

2015-02-15T15:59:15+00:00

If during transmission system error was returned, the logic was to
incorrectly deduce that chip is a TPM 1.x chip. This patch fixes this
issue. Also, this patch changes probing so that message tag is used as the
measure for TPM 2.x, which should be much more stable. A separate function
called tpm2_probe() is encapsulated because it can be used with any
chipset.

Fixes: aec04cbdf723 ("tpm: TPM 2.0 FIFO Interface")
Signed-off-by: Jarkko Sakkinen 
Reviewed-by: Stefan Berger 
Reviewed-by: Peter Huewe 
Signed-off-by: Peter Huewe

tpm: fix suspend/resume paths for TPM 2.0

2015-02-15T15:56:49+00:00

Fixed suspend/resume paths for TPM 2.0 and consolidated all the
associated code to the tpm_pm_suspend() and tpm_pm_resume()
functions. Resume path should be handled by the firmware, i.e.
Startup(CLEAR) for hibernate and Startup(STATE) for suspend.

There might be some non-PC embedded devices in the future where
Startup() is not the handled by the FW but fixing the code for
those IMHO should be postponed until there is hardware available
to test the fixes although extra Startup in the driver code is
essentially a NOP.

Added Shutdown(CLEAR) to the remove paths of TIS and CRB drivers.
Changed tpm2_shutdown() to a void function because there isn't
much you can do except print an error message if this fails with
a system error.

Fixes: aec04cbdf723 ("tpm: TPM 2.0 FIFO Interface")
Fixes: 30fc8d138e91 ("tpm: TPM 2.0 CRB Interface")
[phuewe: both did send TPM_Shutdown on resume which 'disables' the TPM
and did not send TPM2_Shutdown on teardown which leads some TPM2.0 to
believe there was an attack (no TPM2_Shutdown = no orderly shutdown =
attack)]

Reported-by: Peter Hüwe 
Signed-off-by: Jarkko Sakkinen 
Tested-by: Scot Doyle 
Reviewed-by: Peter Huewe 
Signed-off-by: Peter Huewe

tpm/tpm_tis: Add missing ifdef CONFIG_ACPI for pnp_acpi_device

2015-01-22T02:37:33+00:00

This fixes a build failure if CONFIG_PNP is set but CONFIG_ACPI is not:
drivers/char/tpm/tpm_tis.c: In function ?tpm_tis_pnp_init?:
drivers/char/tpm/tpm_tis.c:912:45: error: invalid type argument of
?->? (have ?int?)
   acpi_dev_handle = pnp_acpi_device(pnp_dev)->handle;

If CONFIG_PNPACPI is not set pnp_acpi_device is defined as 0 and thus
accesing the handle is not possible.

Fixes: 0dc553652102 ("tpm: fix raciness of PPI interface lookup")
Reported-by: Jim Davis 
Signed-off-by: Peter Huewe 
Signed-off-by: James Morris

tpm: fix format string error in tpm-chip.c

2015-01-20T20:28:36+00:00

dev_set_name() takes three arguments where the second argument is
a format string. This patch fixes the call accordingly in tpm-chip.c

Reported-by: kbuild test robot 
Fixes: 313d21eeab92 ("tpm: device class for tpm")
Signed-off-by: Jarkko Sakkinen 
Signed-off-by: Peter Huewe

char/tpm/tpm_crb: fix build error

2015-01-19T19:46:50+00:00

SIMPLE_DEV_PM_OPS() was inside #ifdef CONFIG_PM_SLEEP.

Fixes: 30fc8d1 ("tpm: TPM 2.0 CRB Interface")
Signed-off-by: Jarkko Sakkinen 
Signed-off-by: Peter Huewe

char/tpm: fixed white spaces coding style issues

2015-01-18T13:26:49+00:00

Fixed some coding style issues reported by checkpatch.

Signed-off-by: Bruno E O Meneguele 
[phuewe: ported to latest code]
Signed-off-by: Peter Huewe

tpm/tpm_i2c_stm_st33: Change tpm_i2c_stm_st33.h to tpm_stm_st33.h

2015-01-17T14:04:04+00:00

include/linux/platform_data/tpm_i2c_stm_st33.h can be used by other st33
tpm device driver not using i2c protocol.

Reviewed-by: Jason Gunthorpe 
Signed-off-by: Christophe Ricard 
Reviewed-by: Peter Huewe 
Signed-off-by: Peter Huewe