From patchwork Mon May 17 13:57:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 440102 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1120927jac; Mon, 17 May 2021 07:05:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCUizI8BrfY5RO4PAJQpoZ/vlKAhF8exdV55u03mvVbOoc5mIvraSIidw59sGO4hKueDwd X-Received: by 2002:a50:fe04:: with SMTP id f4mr200618edt.29.1621260306819; Mon, 17 May 2021 07:05:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621260306; cv=none; d=google.com; s=arc-20160816; b=sLHrDAzvWFtx72GwJfQUd0QPkW8FPImnBD9pFy+INRkSUMY6Y6PJ5oChR4Yp+keJDe hrVpFK++8AUwwYIR5oLlM/BdAJOUZtleUPGFfZZzKt9bxeWhfvPEdxSeGhZt2v1diLFY sfT6RILZR+803Q7JQnGMf5QDwsVlVsHK2TmG9+8r5L5zAgtMMtQORMg5If5mDVHNfevK DFx89IGoPKDh3PxyD08zkwDQ0ECHgfZKCqb4B0E49wvYOMgxKqDqp+mv8uatA+F9koxP 4ou4VK88NDedpThyOBfiLqhOM4pb05uGbIotRmdsR/eia8c8ej1hLx4AIE3jGrrSYFcT RrAw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lhBAFQiFdk9FUzenr4NLS4HXL1JD1nxrW22HpShK2dg=; b=GIlHpYCuqtDEFvaz7Cg7zp2SmOxyObZrBNc8j13fti9xswQOFFCGyfxmuGG3c+Sofq NVuQTL/l3h5qyiC3CrWYMMph1Tjd+7UeYOlqUvgAxlhrNRSadhAziQtdoIHgLh1VQ7hA mtaxBog/WSlyfOEM8/yGMABN4hpXgXT75ee3z4NqO+zY/H7zcFe5CnP8VwjlqqLluHfj REGgUXbwz31kUTo2SmXEafc0077rup+emN9ChrlifdFPZG695spbEyVXJVWdncvcC6EZ yUqqA2tyPtK3UWk37BkOMA9/LHv7nnFsG9YB0+zCGLzdnm9+Qqom976m1nmglcB342aF Cvqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ix8WNPBD; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x18si17058398ejd.75.2021.05.17.07.05.06; Mon, 17 May 2021 07:05:06 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ix8WNPBD; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237793AbhEQOGW (ORCPT + 12 others); Mon, 17 May 2021 10:06:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:56984 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237817AbhEQOF4 (ORCPT ); Mon, 17 May 2021 10:05:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3EF0C60E0C; Mon, 17 May 2021 14:04:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621260279; bh=jSsfYsjOAK5vnwE44c3ptQAHVaPrn3/ES+jLwvO6c4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ix8WNPBDwBY6yQW9sT8eSaIGpBiJuFLx6sC1YI5ZB5D02g5tkYS8zHR0dq6d04rz9 qxfUZOWwMiTXNj7rMz4cx1tF6CO/KOKE7I1BiELe+Lqy0jzRqFVKXhsuUIRlukKZ/D hHmojoc9PdOHCu1zMGpwNlMicBKwL1NfoDnDrY6w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Jarkko Sakkinen Subject: [PATCH 5.12 002/363] tpm: fix error return code in tpm2_get_cc_attrs_tbl() Date: Mon, 17 May 2021 15:57:48 +0200 Message-Id: <20210517140302.597308353@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140302.508966430@linuxfoundation.org> References: <20210517140302.508966430@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei commit 1df83992d977355177810c2b711afc30546c81ce upstream. If the total number of commands queried through TPM2_CAP_COMMANDS is different from that queried through TPM2_CC_GET_CAPABILITY, it indicates an unknown error. In this case, an appropriate error code -EFAULT should be returned. However, we currently do not explicitly assign this error code to 'rc'. As a result, 0 was incorrectly returned. Cc: stable@vger.kernel.org Fixes: 58472f5cd4f6("tpm: validate TPM 2.0 commands") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Greg Kroah-Hartman --- drivers/char/tpm/tpm2-cmd.c | 1 + 1 file changed, 1 insertion(+) --- 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_chi if (nr_commands != be32_to_cpup((__be32 *)&buf.data[TPM_HEADER_SIZE + 5])) { + rc = -EFAULT; tpm_buf_destroy(&buf); goto out; }