lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trusted-keys: free memory bugfix

Browse Source 
Add missing kfree(td) in tpm_seal() before the return, freeing
td on error paths as well.

Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Acked-by: David Safford <safford@watson.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
Mimi Zohar
2010-12-20 12:37:18 -05:00
committed by James Morris
parent 581548db3b
commit 40c1001792
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
security/keys/trusted_defined.c
View File

@@ -511,7 +511,7 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keytype,
/* get session for sealing key */ /* get session for sealing key */
ret = osap(tb, &sess, keyauth, keytype, keyhandle); ret = osap(tb, &sess, keyauth, keytype, keyhandle);
if (ret < 0) if (ret < 0)
return ret; goto out;
dump_sess(&sess); dump_sess(&sess);
/* calculate encrypted authorization value */ /* calculate encrypted authorization value */
@@ -519,11 +519,11 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keytype,
memcpy(td->xorwork + SHA1_DIGEST_SIZE, sess.enonce, SHA1_DIGEST_SIZE); memcpy(td->xorwork + SHA1_DIGEST_SIZE, sess.enonce, SHA1_DIGEST_SIZE);
ret = TSS_sha1(td->xorwork, SHA1_DIGEST_SIZE * 2, td->xorhash); ret = TSS_sha1(td->xorwork, SHA1_DIGEST_SIZE * 2, td->xorhash);
if (ret < 0) if (ret < 0)
return ret; goto out;
ret = tpm_get_random(tb, td->nonceodd, TPM_NONCE_SIZE); ret = tpm_get_random(tb, td->nonceodd, TPM_NONCE_SIZE);
if (ret < 0) if (ret < 0)
return ret; goto out;
ordinal = htonl(TPM_ORD_SEAL); ordinal = htonl(TPM_ORD_SEAL);
datsize = htonl(datalen); datsize = htonl(datalen);
pcrsize = htonl(pcrinfosize); pcrsize = htonl(pcrinfosize);
@@ -552,7 +552,7 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keytype,
&datsize, datalen, data, 0, 0); &datsize, datalen, data, 0, 0);
} }
if (ret < 0) if (ret < 0)
return ret; goto out;
/* build and send the TPM request packet */ /* build and send the TPM request packet */
INIT_BUF(tb); INIT_BUF(tb);
@@ -572,7 +572,7 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keytype,
ret = trusted_tpm_send(TPM_ANY_NUM, tb->data, MAX_BUF_SIZE); ret = trusted_tpm_send(TPM_ANY_NUM, tb->data, MAX_BUF_SIZE);
if (ret < 0) if (ret < 0)
return ret; goto out;
/* calculate the size of the returned Blob */ /* calculate the size of the returned Blob */
sealinfosize = LOAD32(tb->data, TPM_DATA_OFFSET + sizeof(uint32_t)); sealinfosize = LOAD32(tb->data, TPM_DATA_OFFSET + sizeof(uint32_t));
@@ -591,6 +591,8 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keytype,
memcpy(blob, tb->data + TPM_DATA_OFFSET, storedsize); memcpy(blob, tb->data + TPM_DATA_OFFSET, storedsize);
*bloblen = storedsize; *bloblen = storedsize;
} }
out:
kfree(td);
return ret; return ret;
} }