Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp308394imj; Wed, 13 Feb 2019 08:40:44 -0800 (PST) X-Google-Smtp-Source: AHgI3Ib9nvYOf12QKogMJhkHOM+THpxM2ZEgYmG+2ytYnk7yS+XivG+66ryeuhg3P/1MKeoVxALl X-Received: by 2002:a65:6147:: with SMTP id o7mr1225792pgv.356.1550076044828; Wed, 13 Feb 2019 08:40:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550076044; cv=none; d=google.com; s=arc-20160816; b=R3/EFVYUjwMZhmdl85rAsw6BhSXracWyewqf9UVNQfmsruXtHkQgV+0VVxmo3RabBf I0Z6qSuTY5pzMatYEab+4R/7BDndg4LGKtqJ5mMOFF4Ui4xAapdj9qR1M6hSzAbmgLdN USeGVv0+eilG6L508g4Hp5LXqIwdywFDOVRbbl3u498f7TSsaR8DiHqe3Wt8t+w37QVS U1/kFzO4I+zlITfwvsVvdHafolLqozRsdJ9b0+iAH3nRLvIIU8lxP5AjaXBrn6LeKkbr cDqOWtxNC/SSItbPXaYjpegBbkUqWpMHkiwmKPjCmnuv1OClil0s18zW1iOwgo3VOs8T xtKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject; bh=jrIl++aex+84ivxAYaVTx7kt1Y9R5hFTU0e5Z3RkrhE=; b=l4x90G0ieXfdsFfQLd2LhwzisrpAEduch9nshWIKdQ7DVu29xjBSA+FK/X2kcjLSzP RxVIsqHhxWZ0+HS2+o+TP8OcQDb5sfOq/sYhwLKFq3zFOpZrrHlUs30juNgjwaxIG3bE AOlmtN7XwdjGWGtrdRJKO0oY721C5F7JGzl8RqYXSgUBO2ptO6dQnr6qCdvbYPuiyU/F g1WuyngRMISkiYz3xrJmHMUyJH2TG3xajzyYCGDYMzC2hyuICvId9k60NLAkX6GvC+zK vUixpRj9L+cy/EOXJp+g5x6rOPuPuFuebFL2O8yy/vRdGDC7ElNTRESMbMDdbWI2uFLt unHQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c8si14419906pgq.300.2019.02.13.08.40.28; Wed, 13 Feb 2019 08:40:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404391AbfBMQkU (ORCPT + 99 others); Wed, 13 Feb 2019 11:40:20 -0500 Received: from mga06.intel.com ([134.134.136.31]:18373 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392610AbfBMQkT (ORCPT ); Wed, 13 Feb 2019 11:40:19 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Feb 2019 08:40:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,366,1544515200"; d="scan'208";a="274781899" Received: from tstruk-mobl1.ra.intel.com (HELO tstruk-mobl1.jf.intel.com) ([10.7.196.56]) by orsmga004.jf.intel.com with ESMTP; 13 Feb 2019 08:40:18 -0800 Subject: [PATCH v3] selftests/tpm2: Extend tests to cover partial reads From: Tadeusz Struk To: jarkko.sakkinen@linux.intel.com Cc: linux-kselftest@vger.kernel.org, shuah@kernel.org, linux-kernel@vger.kernel.org, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, PeterHuewe@gmx.de, jgg@ziepe.ca Date: Wed, 13 Feb 2019 08:40:18 -0800 Message-ID: <155007601798.18778.10490966270922534995.stgit@tstruk-mobl1.jf.intel.com> In-Reply-To: <155007596864.18677.9373151400257566077.stgit@tstruk-mobl1.jf.intel.com> References: <155007596864.18677.9373151400257566077.stgit@tstruk-mobl1.jf.intel.com> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Three new tests added: 1. Send get random cmd, read header in 1st read, read the rest in second read - expect success 2. Send get random cmd, read only part of the response, send another get random command, read the response - expect success 3. Send get random cmd followed by another get random cmd, without reading the first response - expect the second cmd to fail with -EBUSY Signed-off-by: Tadeusz Struk --- v3: - Remove python docstrings v2: - Removed extra logging - Changed subject tag to selftest/tpm2: --- tools/testing/selftests/tpm2/tpm2.py | 1 tools/testing/selftests/tpm2/tpm2_tests.py | 63 ++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/tools/testing/selftests/tpm2/tpm2.py b/tools/testing/selftests/tpm2/tpm2.py index c2b9f2b1a0ac..828c18584624 100644 --- a/tools/testing/selftests/tpm2/tpm2.py +++ b/tools/testing/selftests/tpm2/tpm2.py @@ -22,6 +22,7 @@ TPM2_CC_UNSEAL = 0x015E TPM2_CC_FLUSH_CONTEXT = 0x0165 TPM2_CC_START_AUTH_SESSION = 0x0176 TPM2_CC_GET_CAPABILITY = 0x017A +TPM2_CC_GET_RANDOM = 0x017B TPM2_CC_PCR_READ = 0x017E TPM2_CC_POLICY_PCR = 0x017F TPM2_CC_PCR_EXTEND = 0x0182 diff --git a/tools/testing/selftests/tpm2/tpm2_tests.py b/tools/testing/selftests/tpm2/tpm2_tests.py index 3bb066fea4a0..d4973be53493 100644 --- a/tools/testing/selftests/tpm2/tpm2_tests.py +++ b/tools/testing/selftests/tpm2/tpm2_tests.py @@ -158,6 +158,69 @@ class SmokeTest(unittest.TestCase): pass self.assertEqual(rejected, True) + def test_read_partial_resp(self): + try: + fmt = '>HIIH' + cmd = struct.pack(fmt, + tpm2.TPM2_ST_NO_SESSIONS, + struct.calcsize(fmt), + tpm2.TPM2_CC_GET_RANDOM, + 0x20) + self.client.tpm.write(cmd) + hdr = self.client.tpm.read(10) + sz = struct.unpack('>I', hdr[2:6])[0] + rsp = self.client.tpm.read() + except: + pass + self.assertEqual(sz, 10 + 2 + 32) + self.assertEqual(len(rsp), 2 + 32) + + def test_read_partial_overwrite(self): + try: + fmt = '>HIIH' + cmd = struct.pack(fmt, + tpm2.TPM2_ST_NO_SESSIONS, + struct.calcsize(fmt), + tpm2.TPM2_CC_GET_RANDOM, + 0x20) + self.client.tpm.write(cmd) + # Read part of the respone + rsp1 = self.client.tpm.read(15) + + # Send a new cmd + self.client.tpm.write(cmd) + + # Read the whole respone + rsp2 = self.client.tpm.read() + except: + pass + self.assertEqual(len(rsp1), 15) + self.assertEqual(len(rsp2), 10 + 2 + 32) + + def test_send_two_cmds(self): + rejected = False + try: + fmt = '>HIIH' + cmd = struct.pack(fmt, + tpm2.TPM2_ST_NO_SESSIONS, + struct.calcsize(fmt), + tpm2.TPM2_CC_GET_RANDOM, + 0x20) + self.client.tpm.write(cmd) + + # expect the second one to raise -EBUSY error + self.client.tpm.write(cmd) + rsp = self.client.tpm.read() + + except IOError, e: + # read the response + rsp = self.client.tpm.read() + rejected = True + pass + except: + pass + self.assertEqual(rejected, True) + class SpaceTest(unittest.TestCase): def setUp(self): logging.basicConfig(filename='SpaceTest.log', level=logging.DEBUG)