diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-10 13:09:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-10 13:09:33 -0700 |
| commit | ada3bfb6492a6d0d3eca50f3b61315fe032efc72 (patch) | |
| tree | 10be4da5fc33357dc362e64e295c00ac7be421b4 /drivers/char | |
| parent | Merge tag 'v6.1-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle (diff) | |
| download | linux-dev-ada3bfb6492a6d0d3eca50f3b61315fe032efc72.tar.xz linux-dev-ada3bfb6492a6d0d3eca50f3b61315fe032efc72.zip | |
Merge tag 'tpmdd-next-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull tpm updates from Jarkko Sakkinen:
"Just a few bug fixes this time"
* tag 'tpmdd-next-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle
security/keys: Remove inconsistent __user annotation
char: move from strlcpy with unused retval to strscpy
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/tpm_ppi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c index 40018a73b3cb..bc7b1b4501b3 100644 --- a/drivers/char/tpm/tpm_ppi.c +++ b/drivers/char/tpm/tpm_ppi.c @@ -380,7 +380,7 @@ void tpm_add_ppi(struct tpm_chip *chip) TPM_PPI_FN_VERSION, NULL, ACPI_TYPE_STRING); if (obj) { - strlcpy(chip->ppi_version, obj->string.pointer, + strscpy(chip->ppi_version, obj->string.pointer, sizeof(chip->ppi_version)); ACPI_FREE(obj); } |