Skip to content

Commit 94bfdb0

Browse files
williamspatricksmb49
authored andcommitted
tpm: fix NPE on probe for missing device
BugLink: https://bugs.launchpad.net/bugs/1962230 commit 84cc695 upstream. When using the tpm_tis-spi driver on a system missing the physical TPM, a null pointer exception was observed. [ 0.938677] Unable to handle kernel NULL pointer dereference at virtual address 00000004 [ 0.939020] pgd = 10c753cb [ 0.939237] [00000004] *pgd=00000000 [ 0.939808] Internal error: Oops: 5 [#1] SMP ARM [ 0.940157] CPU: 0 PID: 48 Comm: kworker/u4:1 Not tainted 5.15.10-dd1e40c #1 [ 0.940364] Hardware name: Generic DT based system [ 0.940601] Workqueue: events_unbound async_run_entry_fn [ 0.941048] PC is at tpm_tis_remove+0x28/0xb4 [ 0.941196] LR is at tpm_tis_core_init+0x170/0x6ac This is due to an attempt in 'tpm_tis_remove' to use the drvdata, which was not initialized in 'tpm_tis_core_init' prior to the first error. Move the initialization of drvdata earlier so 'tpm_tis_remove' has access to it. Signed-off-by: Patrick Williams <[email protected]> Fixes: 79ca6f7 ("tpm: fix Atmel TPM crash caused by too frequent queries") Cc: [email protected] Reviewed-by: Jarkko Sakkinen <[email protected]> Signed-off-by: Jarkko Sakkinen <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent 401084f commit 94bfdb0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/char/tpm/tpm_tis_core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -950,6 +950,8 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
950950
priv->timeout_max = TPM_TIMEOUT_USECS_MAX;
951951
priv->phy_ops = phy_ops;
952952

953+
dev_set_drvdata(&chip->dev, priv);
954+
953955
rc = tpm_tis_read32(priv, TPM_DID_VID(0), &vendor);
954956
if (rc < 0)
955957
return rc;
@@ -962,8 +964,6 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
962964
priv->timeout_max = TIS_TIMEOUT_MAX_ATML;
963965
}
964966

965-
dev_set_drvdata(&chip->dev, priv);
966-
967967
if (is_bsw()) {
968968
priv->ilb_base_addr = ioremap(INTEL_LEGACY_BLK_BASE_ADDR,
969969
ILB_REMAP_SIZE);

0 commit comments

Comments
 (0)