From patchwork Thu Jul 13 00:41:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Zimmerman via tpmdd-devel X-Patchwork-Id: 787459 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x7H8T0Kh8z9s0g for ; Thu, 13 Jul 2017 10:42:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=lists.sourceforge.net header.i=@lists.sourceforge.net header.b="UFwQgwbL"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sourceforge.net header.i=@sourceforge.net header.b="j1vAsy5W"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sf.net header.i=@sf.net header.b="RySQ4qvx"; dkim=neutral (0-bit key) header.d=google.com header.i=@google.com header.b="P1VoWcnO"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Reply-To:From:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References:In-Reply-To:Message-Id:Date:To; bh=XvfzT70J2sr+dfmzaAV8cj8bmpMb3tpYT2/p0LRqXG8=; b=UFwQgwbLliWv6sa3H1YnzeZG8TgniPdmBTAsJgYIu8wJAD2ENBs8qE8sUspXGJjkSvTeSxc5sJPOYTrh7DyeSbe0Q0AorwqKVy/LqNEnTwdLQqjLcuLfeSRvhV6eG9mWIm3nDpkfSewEsjUiYFhRDj855Gu1sNS+oU46P9ZxoaM=; Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1dVSCo-0000C6-Sa; Thu, 13 Jul 2017 00:42:10 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1dVSCn-0000Bs-VQ for tpmdd-devel@lists.sourceforge.net; Thu, 13 Jul 2017 00:42:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=ZB0k8S96YHFFE+QfmSd/mrWRbB2du8RjT1F9dmLgQ/k=; b=j1vAsy5WgP/FMMarvynBVW5wVzZf1LJ9/yFSc0+uDfDn5k8eCI5TiKOLHYedBW1WvLnMOW/4LURiN+67ICOPOOQGTyyMWVEC00z3+xOJI4eOBvo7xlxTa9KpWo1Jgq0GGgS+coRFfDcNHxzG987osIBdpQsMbSs4dwitCCLCCqY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=ZB0k8S96YHFFE+QfmSd/mrWRbB2du8RjT1F9dmLgQ/k=; b=RySQ4qvxt0OwFn9plm6MrbO2lyW/PMFEpdhHuxBqzrq+ihvXI/qLbJS0AhEKBa9VEn1lWfh75+dNE669wcsgUPjfYacsz4ZcfXwidSJQMfAe/8d1PtklCFmUGPm7tUOQ6G0P0stu3PhhuNbPgN+r/8bQiHh1xVyCWwiLqJEAi4c=; Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of google.com designates 74.125.83.43 as permitted sender) client-ip=74.125.83.43; envelope-from=joshz@google.com; helo=mail-pg0-f43.google.com; Received: from mail-pg0-f43.google.com ([74.125.83.43]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:AES128-SHA:128) (Exim 4.76) id 1dVSCn-00049A-2t for tpmdd-devel@lists.sourceforge.net; Thu, 13 Jul 2017 00:42:09 +0000 Received: by mail-pg0-f43.google.com with SMTP id j186so20800546pge.2 for ; Wed, 12 Jul 2017 17:42:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZB0k8S96YHFFE+QfmSd/mrWRbB2du8RjT1F9dmLgQ/k=; b=P1VoWcnO5Qdb4gwNez9EmeVZn/EmyyrRNcPbyWg0AwGlbIALyDv1nxA6a5gp68Zb52 heCL3fbdx5sGGupp3u/h9edM9/uKVfeCGAeASuHDQ8S4aFv8vc1TX4uX5QojyX5z2AXZ uYADZybpqoWd7AODkIJ8TVqJePsHDcntrNSw2Z+3PZB76hJcYXjgkZTYQ4PcLCwZCedE xROr3E/QnXAmDa7A78Eva7rRRAX4opDrHmg4ZkPzimsrrVaPfq+fZuSLJRSeCrLtw/NK guoeEF26IUdwC/FkRkMHgrEtkIZguE9He/a5LKtqR70D5/ZTCccZzZcFjuTGESNp9Rgx jvlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZB0k8S96YHFFE+QfmSd/mrWRbB2du8RjT1F9dmLgQ/k=; b=pl2KoAwzjgWbTXz+6ojj/QLz7meRDwiVjCnSCUiROlzHNfprB2Dmraiw/7Lz+qclOO awFp+/+o3L1zjiOjmIx9LTJBxJSc2G6CRIr8p6veT6f1TjNUhfp/yUp3KT4cLEnItj6P pf4ojS/CC2rdaUocdYfIAjX0L7dmqRk+uhz7LxmouUU5UidEkR+s6jfIhzLRitwKIbZG ufoeIbwPmVg2412FrVHN7u5zO1xpArPFFN1qeuTXB6/PRyK+LhJtZA+Wxqc8qZHFKzoJ OIJbfc5k25oSmk3E3/WvadPH5wT0a6hUYUKWW1ka8RbFK4CSqpP2pzEbtHHgVCUcrhZX 5LIQ== X-Gm-Message-State: AIVw113XCZtNNRb3sYxJqhx224idvvIkeRewgX6Hgu4ClFKQi1YVthbB BZotFHK9C1dbvvgW X-Received: by 10.84.232.15 with SMTP id h15mr6941113plk.168.1499906523314; Wed, 12 Jul 2017 17:42:03 -0700 (PDT) Received: from angband.kir.corp.google.com ([100.66.174.26]) by smtp.googlemail.com with ESMTPSA id n74sm8571289pfh.118.2017.07.12.17.42.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Jul 2017 17:42:02 -0700 (PDT) To: Jarkko Sakkinen , Jason Gunthorpe , tpmdd-devel@lists.sourceforge.net, gregkh@linuxfoundation.org, stable@vger.kernel.org Date: Wed, 12 Jul 2017 17:41:21 -0700 Message-Id: <20170713004121.21750-3-joshz@google.com> X-Mailer: git-send-email 2.13.2.932.g7449e964c-goog In-Reply-To: <20170713004121.21750-1-joshz@google.com> References: <20170713004121.21750-1-joshz@google.com> X-Spam-Score: -1.4 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain 0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source [74.125.83.43 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [74.125.83.43 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.2 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1dVSCn-00049A-2t Subject: [tpmdd-devel] [PATCH v1 2/2] tpm: Issue a TPM2_Shutdown for TPM2 devices. X-BeenThere: tpmdd-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: Tpm Device Driver maintainance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Josh Zimmerman via tpmdd-devel From: Josh Zimmerman via tpmdd-devel Reply-To: Josh Zimmerman MIME-Version: 1.0 Errors-To: tpmdd-devel-bounces@lists.sourceforge.net Backport of d1bd4a792d3961a04e6154118816b00167aad91a upstream. If a TPM2 loses power without a TPM2_Shutdown command being issued (a "disorderly reboot"), it may lose some state that has yet to be persisted to NVRam, and will increment the DA counter. After the DA counter gets sufficiently large, the TPM will lock the user out. NOTE: This only changes behavior on TPM2 devices. Since TPM1 uses sysfs, and sysfs relies on implicit locking on chip->ops, it is not safe to allow this code to run in TPM1, or to add sysfs support to TPM2, until that locking is made explicit. Signed-off-by: Josh Zimmerman Reviewed-by: Jarkko Sakkinen --- drivers/char/tpm/tpm-chip.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/char/tpm/tpm-sysfs.c | 5 +++++ 2 files changed, 41 insertions(+) diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index a017ccd8cc3b..9ff853229957 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -130,6 +130,41 @@ static void tpm_dev_release(struct device *dev) kfree(chip); } + +/** + * tpm_class_shutdown() - prepare the TPM device for loss of power. + * @dev: device to which the chip is associated. + * + * Issues a TPM2_Shutdown command prior to loss of power, as required by the + * TPM 2.0 spec. + * Then, calls bus- and device- specific shutdown code. + * + * XXX: This codepath relies on the fact that sysfs is not enabled for + * TPM2: sysfs uses an implicit lock on chip->ops, so this could race if TPM2 + * has sysfs support enabled before TPM sysfs's implicit locking is fixed. + */ +static int tpm_class_shutdown(struct device *dev) +{ + struct tpm_chip *chip = container_of(dev, struct tpm_chip, dev); + + if (chip->flags & TPM_CHIP_FLAG_TPM2) { + down_write(&chip->ops_sem); + tpm2_shutdown(chip, TPM2_SU_CLEAR); + chip->ops = NULL; + up_write(&chip->ops_sem); + } + /* Allow bus- and device-specific code to run. Note: since chip->ops + * is NULL, more-specific shutdown code will not be able to issue TPM + * commands. + */ + if (dev->bus && dev->bus->shutdown) + dev->bus->shutdown(dev); + else if (dev->driver && dev->driver->shutdown) + dev->driver->shutdown(dev); + return 0; +} + + /** * tpm_chip_alloc() - allocate a new struct tpm_chip instance * @pdev: device to which the chip is associated @@ -168,6 +203,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *pdev, device_initialize(&chip->dev); chip->dev.class = tpm_class; + chip->dev.class->shutdown = tpm_class_shutdown; chip->dev.release = tpm_dev_release; chip->dev.parent = pdev; chip->dev.groups = chip->groups; diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c index a76ab4af9fb2..774148db0fac 100644 --- a/drivers/char/tpm/tpm-sysfs.c +++ b/drivers/char/tpm/tpm-sysfs.c @@ -284,6 +284,11 @@ static const struct attribute_group tpm_dev_group = { void tpm_sysfs_add_device(struct tpm_chip *chip) { + /* XXX: If you wish to remove this restriction, you must first update + * tpm_sysfs to explicitly lock chip->ops. + */ + if (chip->flags & TPM_CHIP_FLAG_TPM2) + return; /* The sysfs routines rely on an implicit tpm_try_get_ops, device_del * is called before ops is null'd and the sysfs core synchronizes this * removal so that no callbacks are running or can run again