Commit 07e773db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tpmdd-next-6.11-rc1-roundtwo' of... 

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

Pull tpm fix from Jarkko Sakkinen:
 "An additional fix that supplements my earlier fixes for handling auth,
  which I unfortunately missed last time"

* tag 'tpmdd-next-6.11-rc1-roundtwo' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm: Use auth only after NULL check in tpm_buf_check_hmac_response()
parents c434e25b 7dc357d3

drivers/char/tpm/tpm2-sessions.c

+3 −2
Original line number Diff line number Diff line
@@ -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;