]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
tpm: add check after commands attribs tab allocation
authorTadeusz Struk <tadeusz.struk@intel.com>
Mon, 7 Oct 2019 21:46:37 +0000 (14:46 -0700)
committerMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Fri, 17 Jan 2020 17:22:36 +0000 (14:22 -0300)
BugLink: https://bugs.launchpad.net/bugs/1857158
commit f1689114acc5e89a196fec6d732dae3e48edb6ad upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/char/tpm/tpm2-cmd.c

index 89a5397b18d2cda3b7ec7ad75646346d77f7021b..dad2c9258586cfb7870eb8845fc11a0378295147 100644 (file)
@@ -980,6 +980,10 @@ static int tpm2_get_cc_attrs_tbl(struct tpm_chip *chip)
 
        chip->cc_attrs_tbl = devm_kzalloc(&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)