Commit 2e0e2b48 authored Oct 07, 2019 by Tadeusz Struk Committed by Greg Kroah-Hartman Dec 17, 2019

tpm: add check after commands attribs tab allocation



commit f1689114acc5e89a196fec6d732dae3e48edb6ad upstream.

devm_kcalloc() can fail and return NULL so we need to check for that.

Cc: stable@vger.kernel.org
Fixes: 58472f5c ("tpm: validate TPM 2.0 commands")
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3757e381

drivers/char/tpm/tpm2-cmd.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -938,6 +938,10 @@ static int tpm2_get_cc_attrs_tbl(struct tpm_chip *chip)

	chip->cc_attrs_tbl = devm_kcalloc(&chip->dev, 4, nr_commands,		chip->cc_attrs_tbl = devm_kcalloc(&chip->dev, 4, nr_commands,
	GFP_KERNEL);		GFP_KERNEL);
			if (!chip->cc_attrs_tbl) {
			rc = -ENOMEM;
			goto out;
			}

	rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_GET_CAPABILITY);		rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_GET_CAPABILITY);
	if (rc)		if (rc)