Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp725224pxj; Fri, 7 May 2021 19:56:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHg1BfqyDNkpMvzZJgYHJMDi2ycHD5yUG/Q9vsbbzjyG86U+7A6/6vCrLzBWHqX67TZ5cE X-Received: by 2002:a63:7503:: with SMTP id q3mr13820693pgc.435.1620442602986; Fri, 07 May 2021 19:56:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620442602; cv=none; d=google.com; s=arc-20160816; b=TCs3eAOgZ4UNH52XBmDVOyMdPmrnjSTFdpprGaY/XI0BGY234J96lR5Wk+iYSKgtuB /rZxu8hDxY9MX0AplgONmPG+WB3fGJWpBLqZ6DXjDxjjuKaM9ChkV42JNJq2cpE81vLZ 3qM+mQpPANLRt+2a+v00naUhuQ1MtV18WqFaRWOkF39BG8obSGsGIFbwIzBDBWJuiPQ7 WzbnrxnmpCG7tl7nxFJjJqb5ZxrsVCSkRIPSEE34WfDMbbqDtCdYhw+YWgwzGSqL1eBr B7gDRTMDeOWA/DuMpG+pzo4im8v45VJ941UQkf7W+aEb7+/DEfnFi4zNgkdZp6rjkCDN STaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=HVGhzWFMD+/17DRupA60kEhw4IbJn6PPykehoso/f1Q=; b=e5F2NE1e4dkSRJBDEDMVHFJrLcCjPl6NYXHmIkCvR+KuKtBtWGvYQNl/ir6+wAWoAn bE7RFE8FYmqk2i8Pvd9kE/w1OUaGglklHk4SCdQlpeuEvPeAppGuQV1HhIHpdEev52n1 lupIroh+5TZ3SX5l81C4BbCawljuuG0zveYKzf60/aWCC2h8R14OWAlqV1AGzdR+3h6E NHGzWhrpGdF4mD+ZKrYC1VHX4JTIg4bbPGfUU+YPrmZuL6F89WQsFrwRjz7FSkjtP1C5 mqAQiG8frr3gxK9lr49X43ft0JVTIE07AI3TXZjEVIur0UO01hoLIlBozLmzs4SIitL8 Oa8A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h24si8566232pgj.34.2021.05.07.19.56.30; Fri, 07 May 2021 19:56:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230405AbhEHC40 (ORCPT + 99 others); Fri, 7 May 2021 22:56:26 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:17596 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230165AbhEHC4X (ORCPT ); Fri, 7 May 2021 22:56:23 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4FcX192s02z16LX2; Sat, 8 May 2021 10:52:45 +0800 (CST) Received: from thunder-town.china.huawei.com (10.174.177.72) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.498.0; Sat, 8 May 2021 10:55:15 +0800 From: Zhen Lei To: Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , James Bottomley , linux-integrity , linux-kernel CC: Zhen Lei Subject: [PATCH 1/1] tpm: fix error return code in tpm2_get_cc_attrs_tbl() Date: Sat, 8 May 2021 10:54:44 +0800 Message-ID: <20210508025444.1977-1-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.174.177.72] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 58472f5cd4f6("tpm: validate TPM 2.0 commands") Reported-by: Hulk Robot Signed-off-by: Zhen Lei --- drivers/char/tpm/tpm2-cmd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index eff1f12d981a..c84d23951219 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -656,6 +656,7 @@ int tpm2_get_cc_attrs_tbl(struct tpm_chip *chip) if (nr_commands != be32_to_cpup((__be32 *)&buf.data[TPM_HEADER_SIZE + 5])) { + rc = -EFAULT; tpm_buf_destroy(&buf); goto out; } -- 2.25.1