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=-6.8 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,URIBL_BLOCKED,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 19A97C83000 for ; Tue, 28 Apr 2020 18:47:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EAD6C206D6 for ; Tue, 28 Apr 2020 18:47:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099628; bh=p6/qDMrnVbxyIlgKCC8TT69irLDYwq8f/fnI7ON44PI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RNVkGt/w2XZOwXIFLJJgv4LeUFpjBKGGfjzpnPSEw/uDDtnilAO/LRvfRZKixz+Fz 9h77T2JGSpNeqFd6YrEt0ROLAHN/hQw52D3GhopTXie6UJSKHrhD/Wh91xAIdGZTkB k7CW0A9XdPX+bd63vrrjzRi4zxV4IivyUXJe+ppE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730083AbgD1SrD (ORCPT ); Tue, 28 Apr 2020 14:47:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:34558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730926AbgD1Smc (ORCPT ); Tue, 28 Apr 2020 14:42:32 -0400 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 4922F2085B; Tue, 28 Apr 2020 18:42:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099351; bh=p6/qDMrnVbxyIlgKCC8TT69irLDYwq8f/fnI7ON44PI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=at9Gzsj7D1/opniPFHKuXkHhynFv2DmKLH1MSiExQ5S/mpuheYWJd+PCupAVPN6N+ DhRkzuUMEAdHg6bNH0cbu0S70kVXTKyliHhTFnWeDYFKLCBQmTDxpc2LRZ/AlyGp29 BYg16mcZH8766+dDaHX6AerLMZSBbwJWq2BePxSA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tianjia Zhang , Roberto Sassu , Jerry Snitselaar , Jarkko Sakkinen Subject: [PATCH 5.4 115/168] tpm: fix wrong return value in tpm_pcr_extend Date: Tue, 28 Apr 2020 20:24:49 +0200 Message-Id: <20200428182247.059042367@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182231.704304409@linuxfoundation.org> References: <20200428182231.704304409@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: Tianjia Zhang commit 29cb79795e324a8b65e7891d76f8f6ca911ba440 upstream. For the algorithm that does not match the bank, a positive value EINVAL is returned here. I think this is a typo error. It is necessary to return an error value. Cc: stable@vger.kernel.org # 5.4.x Fixes: 9f75c8224631 ("KEYS: trusted: correctly initialize digests and fix locking issue") Signed-off-by: Tianjia Zhang Reviewed-by: Roberto Sassu Reviewed-by: Jerry Snitselaar Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Greg Kroah-Hartman --- drivers/char/tpm/tpm-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -322,7 +322,7 @@ int tpm_pcr_extend(struct tpm_chip *chip for (i = 0; i < chip->nr_allocated_banks; i++) { if (digests[i].alg_id != chip->allocated_banks[i].alg_id) { - rc = EINVAL; + rc = -EINVAL; goto out; } }