From patchwork Wed Apr 26 17:29:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 87933 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp430443vqo; Wed, 26 Apr 2023 11:23:21 -0700 (PDT) X-Google-Smtp-Source: AKy350YT/o5RYxf6L9vjpL3JBpwwiqWyJMd6JFw+ol7ZnuYAk1HDwkqGFIy6IXE6HdwNjzTapcUE X-Received: by 2002:a17:902:c945:b0:1a6:7f14:707e with SMTP id i5-20020a170902c94500b001a67f14707emr26023314pla.9.1682533400925; Wed, 26 Apr 2023 11:23:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682533400; cv=none; d=google.com; s=arc-20160816; b=ZFoatL/lcqFkF92wJ+c9AxioyNeKRd879vzDuiFWTK7yJEpFjjdKlJ1APla678VVkn /wyxOtCfMBnCSMuevsC+bOa2fhzp64UQUfNqrN/hUcWgLZPxaMDdbCGnKbYwhCEST6ve Y0TsFaJ86ZFPAFVTCHgMuBZUX4cKwUQ2z0G7wfqFXFXfoPsV1VBTUfAXBNfjXY+vN8Qc d/yp+wNvvYzfEXOtgbVn9ZVt/rqIDVjlLIoPCrMQ//FuaVoX6tXrlgC84Do6P4IWhy4L J0fGyc5lJUEZOUDixR25gQCxzMI70goF+27IEqAdlo7agRsR5OhWxg4NeOeX7i1Vtg6R cZDQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+DhpUvpRVvIdG5OkeY02GObKTJhq87BnOC+97eKwYCA=; b=nuK3bZqSoXRF3ghGYNzdaRZUuZ21hx6WYdbU8iF45GIilO6KsTS6jitikWqI8/ckRP VsCq9KZgmcp+DQEOJ9fCKhac0SFcbU0N+6pPzFZqP8YlIymxO1gF5epLPuN/iZhg+qEB SqNtL1bixM8wAg0CeeeonqgWN8D2xQQNtwerTLRfyi1MBtT102G8GkaioHplRVRCp6Dh LZBRpaKrxkJCC5VUsfW0/Nyxdk5ZYmXV4cx6ejBNL0Kd5u/TI5QVNeaffsxi7uErZHND PP4DiYkzq9TbvAjmaqdP+eQwBIp2A4QPAotn+g645Z/y91nMFDq/RHMJPv7ZRHjR8exr Vjpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=T0d38LH2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bg24-20020a17090b0d9800b0024b630117a6si14808211pjb.163.2023.04.26.11.23.07; Wed, 26 Apr 2023 11:23:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=T0d38LH2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238577AbjDZR3k (ORCPT + 99 others); Wed, 26 Apr 2023 13:29:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233678AbjDZR3i (ORCPT ); Wed, 26 Apr 2023 13:29:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4425EBE; Wed, 26 Apr 2023 10:29:37 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D76856232F; Wed, 26 Apr 2023 17:29:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EAEE3C433EF; Wed, 26 Apr 2023 17:29:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682530176; bh=dcW/YGcfbxh1/KUv8M6Wk49tlitkkdIukS6SS0m9pEQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T0d38LH2IrCAUzZ3Ljnkpq7lWYQ10iQ7lD0UNtxp3dtB1QhtTGKYwRMaVwe+Q383d r32hskaz+qbLvPgwaj5D6xRl9HRWAGOGcyBjsinyo4WyEeBSF7Lthir2RCTXtnR57m XFRTFKUUB2Uob7VCrAlDqRFlBSyO9Nq+S+LDnHZWnOKfU5KtwfeQf6Ug2EDa9AHU0e KVCEFaVuck9yig1f7nyW2026ZzDYJlwZ5zoAxTja2kR53ExIRld5CRf995ZyChBKTV Ac0jLjllKJqr+Pm85FC/34lFX67KmHeZ+Hy0MOnDS/AdWa48QuixooT1BKCLE6+6qi LotndTosOc+FQ== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , Jerry Snitselaar , Stefan Berger , James Bottomley Cc: stable@vger.kernel.org, "Jason A . Donenfeld" Subject: [PATCH 1/2] tpm_tis: Use tpm_chip_{start,stop} decoration inside tpm_tis_resume Date: Wed, 26 Apr 2023 20:29:27 +0300 Message-Id: <20230426172928.3963287-2-jarkko@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230426172928.3963287-1-jarkko@kernel.org> References: <20230426172928.3963287-1-jarkko@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764264143523033184?= X-GMAIL-MSGID: =?utf-8?q?1764264143523033184?= Before sending a TPM command, CLKRUN protocol must be disabled. This is not done in the case of tpm1_do_selftest() call site inside tpm_tis_resume(). Address this by decorating the calls with tpm_chip_{start,stop}, which arm and disarm the TPM chip for transmission, and take care of disabling and re-enabling CLKRUN, among other things. Cc: stable@vger.kernel.org Reported-by: Jason A. Donenfeld Link: https://lore.kernel.org/linux-integrity/CS68AWILHXS4.3M36M1EKZLUMS@suppilovahvero/ Fixes: a3fbfae82b4c ("tpm: take TPM chip power gating out of tpm_transmit()") Signed-off-by: Jarkko Sakkinen Reviewed-by: Jerry Snitselaar ops->clk_enable != NULL) - chip->ops->clk_enable(chip, true); - - /* reenable interrupts that device may have lost or - * BIOS/firmware may have disabled + /* + * Re-enable interrupts that device may have lost or BIOS/firmware may + * have disabled. */ rc = tpm_tis_write8(priv, TPM_INT_VECTOR(priv->locality), priv->irq); - if (rc < 0) - goto out; + if (rc < 0) { + dev_err(&chip->dev, "Setting IRQ failed.\n"); + return; + } intmask = priv->int_mask | TPM_GLOBAL_INT_ENABLE; - - tpm_tis_write32(priv, TPM_INT_ENABLE(priv->locality), intmask); - -out: - if (chip->ops->clk_enable != NULL) - chip->ops->clk_enable(chip, false); - - return; + rc = tpm_tis_write32(priv, TPM_INT_ENABLE(priv->locality), intmask); + if (rc < 0) + dev_err(&chip->dev, "Enabling interrupts failed.\n"); } int tpm_tis_resume(struct device *dev) @@ -1235,27 +1230,27 @@ int tpm_tis_resume(struct device *dev) struct tpm_chip *chip = dev_get_drvdata(dev); int ret; - ret = tpm_tis_request_locality(chip, 0); - if (ret < 0) + ret = tpm_chip_start(chip); + if (ret) return ret; if (chip->flags & TPM_CHIP_FLAG_IRQ) tpm_tis_reenable_interrupts(chip); - ret = tpm_pm_resume(dev); - if (ret) - goto out; - /* * TPM 1.2 requires self-test on resume. This function actually returns * an error code but for unknown reason it isn't handled. */ if (!(chip->flags & TPM_CHIP_FLAG_TPM2)) tpm1_do_selftest(chip); -out: - tpm_tis_relinquish_locality(chip, 0); - return ret; + tpm_chip_stop(chip); + + ret = tpm_pm_resume(dev); + if (ret) + return ret; + + return 0; } EXPORT_SYMBOL_GPL(tpm_tis_resume); #endif From patchwork Wed Apr 26 17:29:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 87926 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp415662vqo; Wed, 26 Apr 2023 10:56:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6C8KVLlVVWxl80nLjhaHnFzhUcyS+XkI6Qg4di8yYqRxbfjsFeX+6syJFBbbz53PdGVhNG X-Received: by 2002:a05:6a00:21c6:b0:641:d9b:a458 with SMTP id t6-20020a056a0021c600b006410d9ba458mr1841624pfj.18.1682531779017; Wed, 26 Apr 2023 10:56:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682531779; cv=none; d=google.com; s=arc-20160816; b=B22MJfsyKbxcGm3HhZA3FMuIyKrXI8JgRIyEBzpYylKsK7Fy8CdNj66ATZURvMExN3 r/4Q7W2OuSTUlHQwNmL55p4b4Gp84HB4L+sX9+ffyDvnLBg10qoSVEKt7dhWf2/c0GNo 3fWyfOHXvO6AQPGOXYCqobg2YsBTNCtY5QPthHtYsbagYl0hOc2beZklIN8wmXIH6aOs okY1szbX0f2tYEuRow8j9lATX0FBwujQ4T0it1q3tlAhT8ZOeo3xvN/IT6grJEIXJpNm 5GE7EuQdRFTZjoYbrN7pqn6VokXKZncUvzScCznElheHwaAmnwtFC1NG66I+nPsGPdLo pmag== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JfWTo5tD9jd9L7WhVc137I2G0dlBck7/rBZH+K4KKi0=; b=0R6rw2M9TYPcyJGPg4ck7SnMZlj5yFxoXpusAaMfJ6Bn48iLF8/50JgpxDp/HajPAR gxrxagVO6tXZu/4QVYdI6+UMyHp9brvxTq1jAMLUKFQWpziIS/OnZMLRGxZpiYUFGfdA F8YcyBqROVkvD2M5ARKqf3MjZtVKG+LepQIG+6tKfcvF6g8pYb72GSCLr6cqpPFKEro1 bbqvA/S5Oxwfe4uisVmXO09zDrLHX01hKSoizM2PzMoO4xntl/Eu4hZIE8EToN+kdo/R oxlwuyqAVQ+eagYtReuyoddDezN0OjU2Rsa0MwDP2/B7DcRVoTPhdh/ghbH+Mip3z5Z2 6sZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qiE6OuWA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t127-20020a625f85000000b0063b897210a4si16948030pfb.14.2023.04.26.10.56.06; Wed, 26 Apr 2023 10:56:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qiE6OuWA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239009AbjDZR3o (ORCPT + 99 others); Wed, 26 Apr 2023 13:29:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238587AbjDZR3l (ORCPT ); Wed, 26 Apr 2023 13:29:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 617CF83FA; Wed, 26 Apr 2023 10:29:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F34BA63441; Wed, 26 Apr 2023 17:29:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11EE7C433D2; Wed, 26 Apr 2023 17:29:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682530179; bh=4K/gOer+QGjqHMQJATlyIp1MBELParfSmv57SyLuFJA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qiE6OuWAUVo/BJELaCYkXpzLI5fIwkIjUNsI5JWP4YkDXwaw0vbheoPORQe/LagTY mydsXKJAo4YBMNqPHYuvAcytRwL9+/BxLg2x010umHTF3xIHtpcE+CnvpXPRYAKbMU FVlIRmrDyocQ+p6V22dj5XLnyNu+TtflM3d30Q/SYDcVPMxBn1sTwXu4eQn9AgpDM+ m69nDO+ZqpzZ+2XNQmktq5wS2lG4pRsfOha7chFVSkrCeT7xh4kpUIdUGDiro7mnC5 HDvThWf9vb5nzdODkNeBxAEWKDro4WC+4Y+d2v+pD7rnJS0DFLlu+AAiyjrL20LtGa CNmahOEFV4ISQ== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe Cc: stable@vger.kernel.org Subject: [PATCH 2/2] tpm: Prevent hwrng from activating during resume Date: Wed, 26 Apr 2023 20:29:28 +0300 Message-Id: <20230426172928.3963287-3-jarkko@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230426172928.3963287-1-jarkko@kernel.org> References: <20230426172928.3963287-1-jarkko@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764262442396893463?= X-GMAIL-MSGID: =?utf-8?q?1764262442396893463?= Set TPM_CHIP_FLAG_SUSPENDED in tpm_pm_suspend() and reset in tpm_pm_resume(). While the flag is set, tpm_hwrng() gives back zero bytes. This prevents hwrng from racing during resume. Cc: stable@vger.kernel.org Fixes: 6e592a065d51 ("tpm: Move Linux RNG connection to hwrng") Signed-off-by: Jarkko Sakkinen Reviewed-by: Jerry Snitselaar flags & TPM_CHIP_FLAG_SUSPENDED) + return 0; + return tpm_get_random(chip, data, max); } diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 7e513b771832..0f941cb32eb1 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -412,6 +412,8 @@ int tpm_pm_suspend(struct device *dev) } suspended: + chip->flags |= TPM_CHIP_FLAG_SUSPENDED; + if (rc) dev_err(dev, "Ignoring error %d while suspending\n", rc); return 0; @@ -429,6 +431,14 @@ int tpm_pm_resume(struct device *dev) if (chip == NULL) return -ENODEV; + chip->flags &= ~TPM_CHIP_FLAG_SUSPENDED; + + /* + * Guarantee that SUSPENDED is written last, so that hwrng does not + * activate before the chip has been fully resumed. + */ + wmb(); + return 0; } EXPORT_SYMBOL_GPL(tpm_pm_resume); diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 4dc97b9f65fb..d7073dc45444 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -274,13 +274,14 @@ enum tpm2_cc_attrs { #define TPM_VID_ATML 0x1114 enum tpm_chip_flags { - TPM_CHIP_FLAG_TPM2 = BIT(1), - TPM_CHIP_FLAG_IRQ = BIT(2), - TPM_CHIP_FLAG_VIRTUAL = BIT(3), - TPM_CHIP_FLAG_HAVE_TIMEOUTS = BIT(4), - TPM_CHIP_FLAG_ALWAYS_POWERED = BIT(5), + TPM_CHIP_FLAG_SUSPENDED = BIT(0), + TPM_CHIP_FLAG_TPM2 = BIT(1), + TPM_CHIP_FLAG_IRQ = BIT(2), + TPM_CHIP_FLAG_VIRTUAL = BIT(3), + TPM_CHIP_FLAG_HAVE_TIMEOUTS = BIT(4), + TPM_CHIP_FLAG_ALWAYS_POWERED = BIT(5), TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED = BIT(6), - TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), + TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), }; #define to_tpm_chip(d) container_of(d, struct tpm_chip, dev)