linux-integrity.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] tpm: Move dereference after NULL check in tpm_buf_check_hmac_response
@ 2024-07-09  2:33 Hao Ge
  2024-07-09  6:04 ` Markus Elfring
                   ` (3 more replies)
  0 siblings, 4 replies; 13+ messages in thread
From: Hao Ge @ 2024-07-09  2:33 UTC (permalink / raw)
  To: peterhuewe, jarkko, jgg; +Cc: linux-integrity, linux-kernel, hao.ge, Hao Ge

From: Hao Ge <gehao@kylinos.cn>

We shouldn't dereference "auth" until after we have checked that it is
non-NULL.

Fixes: 7ca110f2679b ("tpm: Address !chip->auth in tpm_buf_append_hmac_session*()")
Signed-off-by: Hao Ge <gehao@kylinos.cn>
---
 drivers/char/tpm/tpm2-sessions.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c
index 2281d55df545..d3521aadd43e 100644
--- a/drivers/char/tpm/tpm2-sessions.c
+++ b/drivers/char/tpm/tpm2-sessions.c
@@ -746,15 +746,16 @@ int tpm_buf_check_hmac_response(struct tpm_chip *chip, struct tpm_buf *buf,
 	struct tpm2_auth *auth = chip->auth;
 	off_t offset_s, offset_p;
 	u8 rphash[SHA256_DIGEST_SIZE];
-	u32 attrs;
+	u32 attrs, cc;
 	struct sha256_state sctx;
 	u16 tag = be16_to_cpu(head->tag);
-	u32 cc = be32_to_cpu(auth->ordinal);
 	int parm_len, len, i, handles;
 
 	if (!auth)
 		return rc;
 
+	cc = be32_to_cpu(auth->ordinal);
+
 	if (auth->session >= TPM_HEADER_SIZE) {
 		WARN(1, "tpm session not filled correctly\n");
 		goto out;
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2024-07-16 10:57 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-09  2:33 [PATCH] tpm: Move dereference after NULL check in tpm_buf_check_hmac_response Hao Ge
2024-07-09  6:04 ` Markus Elfring
2024-07-14 15:43 ` Jarkko Sakkinen
2024-07-15  7:24   ` [PATCH v2] " Hao Ge
2024-07-15  8:29   ` [PATCH] " Hao Ge
2024-07-15 11:25 ` Jarkko Sakkinen
2024-07-15 11:52   ` James Bottomley
2024-07-16 10:06     ` Jarkko Sakkinen
2024-07-16  1:04   ` Hao Ge
2024-07-16 10:20     ` Jarkko Sakkinen
2024-07-16 10:33 ` Jarkko Sakkinen
2024-07-16 10:35   ` Jarkko Sakkinen
2024-07-16 10:57   ` Jarkko Sakkinen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).