diff options
| author |   Tadeusz Struk <tadeusz.struk@intel.com> | 2019-10-07 14:46:37 -0700 |
|---|---|---|
| committer |   Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2019-11-12 21:45:37 +0200 |
| commit | f1689114acc5e89a196fec6d732dae3e48edb6ad (patch) | |
| tree | acebb07fcaf593a6a17bd6973d5307ddda5d1441 /drivers/char | |
| parent | tpm: tpm_tis_spi: Drop THIS_MODULE usage from driver struct (diff) | |
| download | linux-dev-f1689114acc5e89a196fec6d732dae3e48edb6ad.tar.xz linux-dev-f1689114acc5e89a196fec6d732dae3e48edb6ad.zip | |
tpm: add check after commands attribs tab allocation
devm_kcalloc() can fail and return NULL so we need to check for that.
Cc: stable@vger.kernel.org
Fixes: 58472f5cd4f6f ("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>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/tpm2-cmd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index ba9acae83bff..5817dfe5c5d2 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -939,6 +939,10 @@ static int tpm2_get_cc_attrs_tbl(struct tpm_chip *chip) chip->cc_attrs_tbl = devm_kcalloc(&chip->dev, 4, nr_commands, GFP_KERNEL); + if (!chip->cc_attrs_tbl) { + rc = -ENOMEM; + goto out; + } rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_GET_CAPABILITY); if (rc) |