From patchwork Sun Oct 9 02:15:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nayna X-Patchwork-Id: 9368327 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C306760487 for ; Sun, 9 Oct 2016 02:16:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD5D42907A for ; Sun, 9 Oct 2016 02:16:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2124292B4; Sun, 9 Oct 2016 02:16:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A717D2907A for ; Sun, 9 Oct 2016 02:16:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1bt3f9-0006wA-92; Sun, 09 Oct 2016 02:16:27 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1bt3f7-0006w4-Dr for tpmdd-devel@lists.sourceforge.net; Sun, 09 Oct 2016 02:16:25 +0000 X-ACL-Warn: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1bt3f6-0001ib-8j for tpmdd-devel@lists.sourceforge.net; Sun, 09 Oct 2016 02:16:25 +0000 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u992DiAn076161 for ; Sat, 8 Oct 2016 22:16:18 -0400 Received: from e23smtp04.au.ibm.com (e23smtp04.au.ibm.com [202.81.31.146]) by mx0a-001b2d01.pphosted.com with ESMTP id 25y40kpsch-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Sat, 08 Oct 2016 22:16:18 -0400 Received: from localhost by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 9 Oct 2016 12:16:16 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sun, 9 Oct 2016 12:16:14 +1000 Received: from d23relay10.au.ibm.com (d23relay10.au.ibm.com [9.190.26.77]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 7F6C82CE8054 for ; Sun, 9 Oct 2016 13:16:13 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay10.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u992GDvD58654966 for ; Sun, 9 Oct 2016 13:16:13 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u992GCiM013509 for ; Sun, 9 Oct 2016 13:16:13 +1100 Received: from c365f16u1b3.pok.stglabs.ibm.com (c365f16u1b3.pok.stglabs.ibm.com [9.47.77.42]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u992G1YG013355; Sun, 9 Oct 2016 13:16:11 +1100 From: Nayna Jain To: tpmdd-devel@lists.sourceforge.net Date: Sat, 8 Oct 2016 22:15:56 -0400 X-Mailer: git-send-email 2.5.0 In-Reply-To: <1475979357-1167-1-git-send-email-nayna@linux.vnet.ibm.com> References: <1475979357-1167-1-git-send-email-nayna@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16100902-0012-0000-0000-000001D38F76 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16100902-0013-0000-0000-0000062AAA35 Message-Id: <1475979357-1167-2-git-send-email-nayna@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-10-08_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=15 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1610090038 X-Headers-End: 1bt3f6-0001ib-8j Subject: [tpmdd-devel] [PATCH 1/2] tpm: implement TPM 2.0 capability to get active PCR banks 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: , MIME-Version: 1.0 Errors-To: tpmdd-devel-bounces@lists.sourceforge.net X-Virus-Scanned: ClamAV using ClamSMTP As per the TCG 2.0 spec, the extend operation should be done to all active PCR banks. However, current TPM 2.0 support doesn't have the capability implemented to get active PCR banks. This patch implements the TPM 2.0 capability TPM_CAP_PCRS to retrieve active PCR banks from the TPM. Signed-off-by: Nayna Jain --- drivers/char/tpm/tpm-chip.c | 4 +++ drivers/char/tpm/tpm.h | 8 ++++- drivers/char/tpm/tpm2-cmd.c | 80 +++++++++++++++++++++++++++++++++++++++++++++ drivers/char/tpm/tpm2.h | 35 ++++++++++++++++++++ 4 files changed, 126 insertions(+), 1 deletion(-) diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index 72715fa..667240b 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -27,6 +27,7 @@ #include #include #include "tpm.h" +#include "tpm2.h" #include "tpm_eventlog.h" DEFINE_IDR(dev_nums_idr); @@ -364,6 +365,9 @@ int tpm_chip_register(struct tpm_chip *chip) chip->flags |= TPM_CHIP_FLAG_REGISTERED; + if (chip->flags & TPM_CHIP_FLAG_TPM2) + tpm2_get_active_pcr_banks(chip); + rc = tpm_add_legacy_sysfs(chip); if (rc) { tpm_chip_unregister(chip); diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 989227a..70f5ac4 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -36,6 +36,9 @@ #include #include "tpm_eventlog.h" +#include "tpm2.h" + +#define TPM2_ACTIVE_BANKS_COUNT HASH_COUNT enum tpm_const { TPM_MINOR = 224, /* officially assigned */ @@ -126,6 +129,7 @@ enum tpm2_permanent_handles { }; enum tpm2_capabilities { + TPM2_CAP_PCRS = 5, TPM2_CAP_TPM_PROPERTIES = 6, }; @@ -167,6 +171,9 @@ struct tpm_chip { int dev_num; /* /dev/tpm# */ unsigned long is_open; /* only one allowed */ + int no_of_active_banks; /* Applicable on TPM2.0 */ + enum tpm2_algorithms active_banks[TPM2_ACTIVE_BANKS_COUNT]; + struct mutex tpm_mutex; /* tpm is processing */ unsigned long timeout_a; /* jiffies */ @@ -526,7 +533,6 @@ static inline void tpm_add_ppi(struct tpm_chip *chip) #endif int tpm2_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf); -int tpm2_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash); int tpm2_get_random(struct tpm_chip *chip, u8 *out, size_t max); int tpm2_seal_trusted(struct tpm_chip *chip, struct trusted_key_payload *payload, diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index 7df55d5..c597cf3c 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -100,6 +100,8 @@ union tpm2_cmd_params { struct tpm2_pcr_extend_in pcrextend_in; struct tpm2_get_tpm_pt_in get_tpm_pt_in; struct tpm2_get_tpm_pt_out get_tpm_pt_out; + struct tpm2_get_cap_in get_cap_in; + struct tpm2_get_cap_out get_cap_out; struct tpm2_get_random_in getrandom_in; struct tpm2_get_random_out getrandom_out; }; @@ -990,3 +992,81 @@ out: rc = -ENODEV; return rc; } + +#define TPM2_GET_CAPABILITY_IN_SIZE \ + (sizeof(struct tpm_input_header) + \ + sizeof(struct tpm2_get_cap_in)) + +static const struct tpm_input_header tpm2_get_capability_header = { + .tag = cpu_to_be16(TPM2_ST_NO_SESSIONS), + .length = cpu_to_be32(TPM2_GET_CAPABILITY_IN_SIZE), + .ordinal = cpu_to_be32(TPM2_CC_GET_CAPABILITY) +}; + +int tpm2_get_capability(struct tpm_chip *chip, struct tpm2_get_cap_in *cap_in, + struct tpm2_get_cap_out *cap_out) +{ + + struct tpm2_cmd cmd; + int rc; + u32 cap_id; + + cmd.header.in = tpm2_get_capability_header; + cmd.params.get_cap_in.cap_id = cpu_to_be32(cap_in->cap_id); + cmd.params.get_cap_in.property_id = cpu_to_be32(cap_in->property_id); + cmd.params.get_cap_in.property_cnt = cpu_to_be32(cap_in->property_cnt); + + rc = tpm_transmit_cmd(chip, (const char *) &cmd, sizeof(cmd), 0, + "attempting get capability operation"); + if (rc < 0) + return rc; + cap_id = be32_to_cpu(cmd.params.get_cap_out.cap_data.cap_id); + + switch (cap_id) { + case TPM2_CAP_PCRS: + memcpy(&cap_out->cap_data, &cmd.params.get_cap_out.cap_data, + sizeof(cmd.params.get_cap_out.cap_data)); + break; + default: + return -EOPNOTSUPP; + } + + return rc; +} + +int tpm2_get_active_pcr_banks(struct tpm_chip *chip) +{ + struct tpm2_get_cap_in cap_in; + struct tpm2_get_cap_out cap_out; + struct tpm2_tpms_pcr_selection *pcr_selection; + void *marker; + u32 cap_id; + int rc, count, i; + + cap_in.cap_id = TPM2_CAP_PCRS; + cap_in.property_id = 0; + cap_in.property_cnt = 1; + + rc = tpm2_get_capability(chip, &cap_in, &cap_out); + + if (rc < 0) + return rc; + + cap_id = be32_to_cpu(cap_out.cap_data.cap_id); + count = be32_to_cpu(cap_out.cap_data.data.assigned_pcr.count); + pcr_selection = + &cap_out.cap_data.data.assigned_pcr.pcr_selections[0]; + marker = pcr_selection; + chip->no_of_active_banks = 0; + + for (i = 0; (i < count) && (i < TPM2_ACTIVE_BANKS_COUNT); i++) { + memcpy(pcr_selection, marker, sizeof(*pcr_selection)); + chip->active_banks[chip->no_of_active_banks] = + be16_to_cpu(pcr_selection->hash_alg); + chip->no_of_active_banks++; + marker = marker + sizeof(pcr_selection->hash_alg) + sizeof(u8) + + sizeof(u8) * pcr_selection->size_of_select; + } + + return rc; +} diff --git a/drivers/char/tpm/tpm2.h b/drivers/char/tpm/tpm2.h index 399c15c..919fb05 100644 --- a/drivers/char/tpm/tpm2.h +++ b/drivers/char/tpm/tpm2.h @@ -74,6 +74,41 @@ struct tcg_pcr_event2 { struct tcg_event_field event; } __packed; +struct tpm2_get_cap_in { + __be32 cap_id; + __be32 property_id; + __be32 property_cnt; +} __packed; + +struct tpm2_tpms_pcr_selection { + __be16 hash_alg; + u8 size_of_select; + u8 pcr_select[3]; +} __packed; + +struct tpm2_tpml_pcr_selection { + __be32 count; + struct tpm2_tpms_pcr_selection pcr_selections[HASH_COUNT]; +} __packed; + +union tpm2_tpmu_capabilities { + struct tpm2_tpml_pcr_selection assigned_pcr; +} __packed; + +struct tpm2_tpms_capability_data { + __be32 cap_id; + union tpm2_tpmu_capabilities data; +} __packed; + +struct tpm2_get_cap_out { + u8 more_data; + struct tpm2_tpms_capability_data cap_data; +} __packed; + extern const struct seq_operations tpm2_binary_b_measurments_seqops; +extern int tpm2_get_active_pcr_banks(struct tpm_chip *chip); +extern int tpm2_get_capability(struct tpm_chip *chip, struct tpm2_get_cap_in + *cap_in, struct tpm2_get_cap_out *cap_out); + #endif