summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2019-08-26 13:01:30 +0200
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2019-08-26 13:01:30 +0200
commitc9022ae83c7f4ff72d781fb1b43d1ca05e4fabe4 (patch)
treea0f94b372b9e0c4aea84e05ab204e279a36dc757 /security
parenteec76006b68ddb9a5ab3d8363996dbee4c77e76e (diff)
parentf7d5b3dc4792a5fe0a4d6b8106a8f3eb20c3c24c (diff)
downloadlinux-rt-c9022ae83c7f4ff72d781fb1b43d1ca05e4fabe4.tar.gz
Merge tag 'v5.2.10' into linux-5.2.y-rt
This is the 5.2.10 stable release Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'security')
-rw-r--r--security/keys/trusted.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/security/keys/trusted.c b/security/keys/trusted.c
index 9a94672e7adc..ade699131065 100644
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@ -1228,24 +1228,11 @@ hashalg_fail:
static int __init init_digests(void)
{
- u8 digest[TPM_MAX_DIGEST_SIZE];
- int ret;
- int i;
-
- ret = tpm_get_random(chip, digest, TPM_MAX_DIGEST_SIZE);
- if (ret < 0)
- return ret;
- if (ret < TPM_MAX_DIGEST_SIZE)
- return -EFAULT;
-
digests = kcalloc(chip->nr_allocated_banks, sizeof(*digests),
GFP_KERNEL);
if (!digests)
return -ENOMEM;
- for (i = 0; i < chip->nr_allocated_banks; i++)
- memcpy(digests[i].digest, digest, TPM_MAX_DIGEST_SIZE);
-
return 0;
}