From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E885FC43603 for ; Mon, 16 Dec 2019 18:27:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C098F206EC for ; Mon, 16 Dec 2019 18:27:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576520824; bh=l3oBwYvLz9ls60wuoWgre1Z4dfrdBGfWK45ZGV2kUcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=szH+BHh7Qc9wCDAiwNXarVGF6QF4qot1Ar1rg56gEAysL45Jvn0RdqFNe8ZGf8DsD Tx5rlgrgUgwxlY0U30nzNqMO8hJZuNVo9dC5uQHsukRn/eBHbm5GhgIV0ryC9ImYGF dviM1HJTWCKzD6OXaUoYOzC+uY0r1a6ws9UE1cF8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728816AbfLPS1A (ORCPT ); Mon, 16 Dec 2019 13:27:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:38822 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731344AbfLPSQY (ORCPT ); Mon, 16 Dec 2019 13:16:24 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5EC9520717; Mon, 16 Dec 2019 18:16:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576520183; bh=l3oBwYvLz9ls60wuoWgre1Z4dfrdBGfWK45ZGV2kUcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ehT1LuQWwT0+dDlweg0lo+Rw73O+NTDboExmV5g7Bw6uEPvILkAioV6U9EsER/LBg S0gW2WgQrN+zuqpvO8EXYDbUj3gAlT3SHP8zZlWJ25qR9nc77/VHF6Rb1dlGmieD7j EEoT1m5OAWPrwEmJZ9rvHYxzu0HH8nqNn5KVmA9w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tadeusz Struk , Jerry Snitselaar , Jarkko Sakkinen Subject: [PATCH 5.4 051/177] tpm: add check after commands attribs tab allocation Date: Mon, 16 Dec 2019 18:48:27 +0100 Message-Id: <20191216174830.435609534@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174811.158424118@linuxfoundation.org> References: <20191216174811.158424118@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tadeusz Struk 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 Reviewed-by: Jerry Snitselaar Reviewed-by: Jarkko Sakkinen Tested-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Greg Kroah-Hartman --- drivers/char/tpm/tpm2-cmd.c | 4 ++++ 1 file changed, 4 insertions(+) --- 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 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)