From patchwork Sun Nov 20 13:31:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 13050037 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02044C43219 for ; Sun, 20 Nov 2022 13:32:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229698AbiKTNcm (ORCPT ); Sun, 20 Nov 2022 08:32:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229524AbiKTNc3 (ORCPT ); Sun, 20 Nov 2022 08:32:29 -0500 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E809254; Sun, 20 Nov 2022 05:32:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1668951126; bh=Wzja5YwaKAZiFWUMEa0HIMVITjRNh5lgwkhDjVIIVv8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=WI9WkzvqAEVlFAx3MSFarxoHXZ38m3UoVBGKV2bxv521t9ZMeYK3/S75R5P9hjGDg ab4V7zvRgndKizWT8DvP/9Aw99q6KtIC/ZIPE823oZLer7DCFILFkDsS7ntfinQ6hx nA0Ge3cYB+J7yY/sh/5ckOs1+0JCdLSh+XD0+sAQKqO5h3W/39AtG2zj8zq/Or4qoR gKARc+JazRAbBTy6OXo1THYJK56G8wBhYZU3Jzc+Jnp0oqqUyxm3Gi/fv4eGM0aUZB Jzv/GQLuwiOJoXcS74fja1y6T3BqGnjPh1S0xKOqzz1PMp2aKtbMmqdSIJHGIVSl8e 0bB3B0duPSN0w== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from Venus.speedport.ip ([84.162.7.17]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MrhQ6-1pJxlR3urM-00nhs3; Sun, 20 Nov 2022 14:32:06 +0100 From: Lino Sanfilippo To: peterhuewe@gmx.de, jarkko@kernel.org, jgg@ziepe.ca Cc: stefanb@linux.vnet.ibm.com, linux@mniewoehner.de, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, jandryuk@gmail.com, pmenzel@molgen.mpg.de, l.sanfilippo@kunbus.com, LinoSanfilippo@gmx.de, lukas@wunner.de, p.rosenberger@kunbus.com Subject: [PATCH v10 04/14] tpm, tpm_tis: Do not skip reset of original interrupt vector Date: Sun, 20 Nov 2022 14:31:24 +0100 Message-Id: <20221120133134.28926-5-LinoSanfilippo@gmx.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221120133134.28926-1-LinoSanfilippo@gmx.de> References: <20221120133134.28926-1-LinoSanfilippo@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:VUd5I5eDNIynx/FyCcZmsE7B+Hj1CZFkjV5brjm+tc5mzgN2tIH eh0PWN/12QLtOELXmf0NMG5+HCPKEyA5G6L8UqJdL5epvFI9aEysg+NzXS60H1QEcbAXx0a D9oZ1PTbFWhorQp5mHR3Ptu9iCuxpGdn28/ST+U/z+3KV6PLNuwr9/qtpsaFwDlpRVOrwHU VKuaTChCH7d73U34ciS8g== UI-OutboundReport: notjunk:1;M01:P0:asWYfnMi/Wo=;S+A6QUJ0wtwWQ7q2ybxhH9+aYvF U0HaOIIsKHYk6HBVUMH2mhQWYzo/5IRadKEyWsEvwBfsZj7FP/Avb2lBRFN0Peu7ezb5wYVwn GszS/t9X3woWxPTz3tTHZ8kl50mJRzwolWtFTY2mCQzxIIT+hmQjPY4+6/mSTWvZwvXv6GCsf s+Q/b9H68eAhI6tdd2ywlloM+pPl1C8oUafH3Wr7+h8lP9itrChA8aZdnaYLGTPqnKp1DGlZL IwS/WVR8LKEksKMYQ4JyyTT5MOnY7O/oKRz1FVh+a2KxLu/nZRFYwgRnvtWulVnX3rQFSxH3Q Dk5I12Yq3YrLayZAOezJlDq2cmMmx4qv6AxuZhmmgu/yypnULilvwdEj/jMJupT7FcTlm3T2M 9yPMSwkDKHqqcD4s+j7pTl6AtDMuGWhju5oF7T6Vy4g22Ud1SM+CfYECU09XvCr+lEYMgRptR pThYNmL69AM3azQjRowL9HjV4QUccOGemxMr0S5gGxDkoJJkukXWs1cVoU9M8s6KOwbE55VaQ 5jL184fv92djeX9fNmu/Sz506nH8T2jTc1ss6mOfVrX6PtM3q4KgQEpi2WAn5eMuZ0qkF+DmL og4bsoETA8babipE0pkHLTMvOFGVSz5VqzbAljeLAQAXeR3zp6l1FY0Uu0XuY5ApWknlZJOvM G58dicL7MZr3bdNvp+VVr4IshnvXBx8cTG2goeeoV/nVEdxqdWdP+7kNn/vz/X9oJxsYGGsOJ OYnW03gZF2+h6g+UT5Zehb70pN3BTQZllL8Qq0nnEsrOM7Q1fSsOjgIwCPJw4lXFxsYNs5zZ1 QWj5Rf7IdzjP2O19GN4xSo8OdjYBEOtybR0CQ+6BWdNG5DfuprvBeawm+QTkgZHw6enaaeYbX JTI3l64q3d+sQCu2JrL1NlblPrKzImtSg/u6xWPEy0DtUuFo1ho5j5Ve5sJLC/0yfoDfIzkGw FIu9Rw== Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Lino Sanfilippo If in tpm_tis_probe_irq_single() an error occurs after the original interrupt vector has been read, restore the interrupts before the error is returned. Since the caller does not check the error value, return -1 in any case that the TPM_CHIP_FLAG_IRQ flag is not set. Since the return value of function tpm_tis_gen_interrupt() is not longer used, make it a void function. Fixes: 1107d065fdf1 ("tpm_tis: Introduce intermediate layer for TPM access") Signed-off-by: Lino Sanfilippo --- drivers/char/tpm/tpm_tis_core.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index 603b82ca56da..1eac1279594d 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -729,7 +729,7 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id) return IRQ_HANDLED; } -static int tpm_tis_gen_interrupt(struct tpm_chip *chip) +static void tpm_tis_gen_interrupt(struct tpm_chip *chip) { const char *desc = "attempting to generate an interrupt"; u32 cap2; @@ -738,16 +738,14 @@ static int tpm_tis_gen_interrupt(struct tpm_chip *chip) ret = request_locality(chip, 0); if (ret < 0) - return ret; + return; if (chip->flags & TPM_CHIP_FLAG_TPM2) - ret = tpm2_get_tpm_pt(chip, 0x100, &cap2, desc); + tpm2_get_tpm_pt(chip, 0x100, &cap2, desc); else - ret = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc, 0); + tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc, 0); release_locality(chip, 0); - - return ret; } /* Register the IRQ and issue a command that will cause an interrupt. If an @@ -777,42 +775,37 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, rc = tpm_tis_write8(priv, TPM_INT_VECTOR(priv->locality), irq); if (rc < 0) - return rc; + goto restore_irqs; rc = tpm_tis_read32(priv, TPM_INT_STATUS(priv->locality), &int_status); if (rc < 0) - return rc; + goto restore_irqs; /* Clear all existing */ rc = tpm_tis_write32(priv, TPM_INT_STATUS(priv->locality), int_status); if (rc < 0) - return rc; - + goto restore_irqs; /* Turn on */ rc = tpm_tis_write32(priv, TPM_INT_ENABLE(priv->locality), intmask | TPM_GLOBAL_INT_ENABLE); if (rc < 0) - return rc; + goto restore_irqs; clear_bit(TPM_TIS_IRQ_TESTED, &priv->flags); /* Generate an interrupt by having the core call through to * tpm_tis_send */ - rc = tpm_tis_gen_interrupt(chip); - if (rc < 0) - return rc; + tpm_tis_gen_interrupt(chip); +restore_irqs: /* tpm_tis_send will either confirm the interrupt is working or it * will call disable_irq which undoes all of the above. */ if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) { - rc = tpm_tis_write8(priv, original_int_vec, - TPM_INT_VECTOR(priv->locality)); - if (rc < 0) - return rc; - - return 1; + tpm_tis_write8(priv, original_int_vec, + TPM_INT_VECTOR(priv->locality)); + return -1; } return 0;