From patchwork Sun Jan 22 18:48:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Bottomley X-Patchwork-Id: 718260 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 3v63PB4BcQz9t1L for ; Mon, 23 Jan 2017 05:48:29 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1cVNBe-0006Bu-Pr; Sun, 22 Jan 2017 18:48:22 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1cVNBd-0006Bp-HX for tpmdd-devel@lists.sourceforge.net; Sun, 22 Jan 2017 18:48:21 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of HansenPartnership.com designates 66.63.167.143 as permitted sender) client-ip=66.63.167.143; envelope-from=James.Bottomley@HansenPartnership.com; helo=bedivere.hansenpartnership.com; Received: from bedivere.hansenpartnership.com ([66.63.167.143]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1cVNBc-0007YF-7k for tpmdd-devel@lists.sourceforge.net; Sun, 22 Jan 2017 18:48:21 +0000 Received: from localhost (localhost [127.0.0.1]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id 2CFD08EE212; Sun, 22 Jan 2017 10:48:14 -0800 (PST) Received: from bedivere.hansenpartnership.com ([127.0.0.1]) by localhost (bedivere.hansenpartnership.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 08Hw-LPFrl4L; Sun, 22 Jan 2017 10:48:14 -0800 (PST) Received: from [153.66.254.194] (unknown [50.46.144.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by bedivere.hansenpartnership.com (Postfix) with ESMTPSA id BB5B38EE10C; Sun, 22 Jan 2017 10:48:13 -0800 (PST) Message-ID: <1485110892.2504.12.camel@HansenPartnership.com> From: James Bottomley To: Jarkko Sakkinen Date: Sun, 22 Jan 2017 10:48:12 -0800 In-Reply-To: <1485107342.2504.7.camel@HansenPartnership.com> References: <20170116131215.28930-1-jarkko.sakkinen@linux.intel.com> <20170116131215.28930-6-jarkko.sakkinen@linux.intel.com> <1484751663.2717.10.camel@HansenPartnership.com> <20170119104922.vhgz4rxw6yzdrxqt@intel.com> <1484828380.3140.11.camel@HansenPartnership.com> <20170120133914.2wk43nteh2hh7n3c@intel.com> <20170120210522.glx4y4oui36oimld@intel.com> <1485107342.2504.7.camel@HansenPartnership.com> X-Mailer: Evolution 3.16.5 Mime-Version: 1.0 X-Spam-Score: -4.8 (----) 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.0 SPF_PASS SPF: sender matches SPF record -3.2 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 X-Headers-End: 1cVNBc-0007YF-7k Cc: linux-security-module@vger.kernel.org, tpmdd-devel@lists.sourceforge.net, open list Subject: Re: [tpmdd-devel] [PATCH RFC v3 5/5] tpm2: expose resource manager via a device link /dev/tpms X-BeenThere: tpmdd-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Tpm Device Driver maintainance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: tpmdd-devel-bounces@lists.sourceforge.net On Sun, 2017-01-22 at 09:49 -0800, James Bottomley wrote: > On Fri, 2017-01-20 at 23:05 +0200, Jarkko Sakkinen wrote: > > 'tabrm4' branch has been now rebased. It's now on top of master > > branch that contains Stefan's latest patch (min body length check) > > that I've reviewed and tested. It also contains your updated > > /dev/tpms patch. > > > > I guess the 5 commits that are there now are such that we have > > fairly good consensus, don't we? If so, can I add your reviewed-by > > and tested-by to my commits and vice versa? > > We're still failing my test_transients. This is the full python of > the test case: > > > def test_transients(self): > k = self.open_transients() > self.c.flush_context(k[0]) > self.c.change_auth(self.c.SRK, k[1], None, pwd1) > ... > > It's failing at self.c.flush_context(k[0]) with TPM_RC_VALUE. It's > the same problem Ken complained about: TPM2_FlushContext doesn't have > a declared handle area so we don't translate the handle being sent > down. We have to fix this either by intercepting the flush and > manually translating the context, or by being dangerously clever and > marking flush as a command which takes one handle. This is what the dangerously clever fix looks like. With this and a few other changes, my smoke tests now pass. James --- ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index f54226d..d5517f1 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -1053,9 +1053,16 @@ int tpm2_auto_startup(struct tpm_chip *chip) goto out; } - for (i = 0; i < nr_commands; i++) - chip->cc_attrs_tbl[i] = be32_to_cpup( - (u32 *)&buf.data[TPM_HEADER_SIZE + 9 + 4 * i]); + for (i = 0; i < nr_commands; i++) { + u32 attr = be32_to_cpup((u32 *)&buf.data[TPM_HEADER_SIZE + + 9 + 4 * i]); + if ((attr & GENMASK(15,0)) == TPM2_CC_FLUSH_CONTEXT) + /* Warning: dangerous cleverness here. + * Mark flush as taking a handle argument so + * it gets correctly translated */ + attr |= 1 << TPM2_CC_ATTR_CHANDLES; + chip->cc_attrs_tbl[i] = attr; + } chip->nr_commands = nr_commands; tpm_buf_destroy(&buf);