| Message ID | 157048479752.25182.17480591993061064051.stgit@tstruk-mobl1.jf.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tpm: add check after commands attribs tab allocation | expand |
On Mon Oct 07 19, Tadeusz Struk wrote: >devm_kcalloc() can fail and return NULL so we need to check for that. > >Fixes: 58472f5cd4f6f ("tpm: validate TPM 2.0 commands") >Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> >--- > drivers/char/tpm/tpm2-cmd.c | 4 ++++ > 1 file changed, 4 insertions(+) > >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) > Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
On Mon, Oct 07, 2019 at 02:46:37PM -0700, Tadeusz Struk wrote: > devm_kcalloc() can fail and return NULL so we need to check for that. > > Fixes: 58472f5cd4f6f ("tpm: validate TPM 2.0 commands") > Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> Thank you. Cc: stable@vger.kernel.org Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> /Jarkko
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)
devm_kcalloc() can fail and return NULL so we need to check for that. Fixes: 58472f5cd4f6f ("tpm: validate TPM 2.0 commands") Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> --- drivers/char/tpm/tpm2-cmd.c | 4 ++++ 1 file changed, 4 insertions(+)