Merge tag 'tpmdd-next-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

torvalds · torvalds · commit 4cb9dc10a6c3 · 2024-07-15T16:57:27.000-07:00
Pull tpm updates from Jarkko Sakkinen:
 "A couple of bug fixes.

  No new features are coming for this release. I had one in progress but
  decided to let it mature up until 6.12"

* tag 'tpmdd-next-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm_tis_spi: add missing attpm20p SPI device ID entry
  char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
diff --git a/drivers/char/tpm/eventlog/common.c b/drivers/char/tpm/eventlog/common.c
@@ -47,6 +47,8 @@ static int tpm_bios_measurements_open(struct inode *inode,
 	if (!err) {
 		seq = file->private_data;
 		seq->private = chip;
+	} else {
+		put_device(&chip->dev);
 	}
 
 	return err;
diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c
@@ -318,6 +318,7 @@ static void tpm_tis_spi_remove(struct spi_device *dev)
 }
 
 static const struct spi_device_id tpm_tis_spi_id[] = {
+	{ "attpm20p", (unsigned long)tpm_tis_spi_probe },
 	{ "st33htpm-spi", (unsigned long)tpm_tis_spi_probe },
 	{ "slb9670", (unsigned long)tpm_tis_spi_probe },
 	{ "tpm_tis_spi", (unsigned long)tpm_tis_spi_probe },

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ static int tpm_bios_measurements_open(struct inode *inode,`
`47`	`47`	`if (!err) {`
`48`	`48`	`seq = file->private_data;`
`49`	`49`	`seq->private = chip;`
	`50`	`+ } else {`
	`51`	`+ put_device(&chip->dev);`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`return err;`
Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,7 @@ static void tpm_tis_spi_remove(struct spi_device *dev)`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`static const struct spi_device_id tpm_tis_spi_id[] = {`
	`321`	`+ { "attpm20p", (unsigned long)tpm_tis_spi_probe },`
`321`	`322`	`{ "st33htpm-spi", (unsigned long)tpm_tis_spi_probe },`
`322`	`323`	`{ "slb9670", (unsigned long)tpm_tis_spi_probe },`
`323`	`324`	`{ "tpm_tis_spi", (unsigned long)tpm_tis_spi_probe },`