From patchwork Wed Jun 8 23:00:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Swierk X-Patchwork-Id: 9165887 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 69976604DB for ; Wed, 8 Jun 2016 23:01:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5913628310 for ; Wed, 8 Jun 2016 23:01:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D2B12830C; Wed, 8 Jun 2016 23:01:22 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B82B281F9 for ; Wed, 8 Jun 2016 23:01:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424105AbcFHXAu (ORCPT ); Wed, 8 Jun 2016 19:00:50 -0400 Received: from mail-pf0-f180.google.com ([209.85.192.180]:33590 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161879AbcFHXAc (ORCPT ); Wed, 8 Jun 2016 19:00:32 -0400 Received: by mail-pf0-f180.google.com with SMTP id y124so6853194pfy.0 for ; Wed, 08 Jun 2016 16:00:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skyportsystems.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tSJ26x+UjrMKTrWIDgVOuvPKquP5JEokJO3cjfgWsmg=; b=Sm9IWfFg+Rd6A7EKFWOX1kWGr0mriLhrwxZ8GCy1PWbHOg4kEHhzNWZeq7agRpv2g8 aBvMkh+qIFHUwzsZf9DX6HJ/UuSwQ1+oXSMy01jLT3Ofz2oi2Bps2FUSYs1/GSRgixzs +1F+5+6Axm/7jMfrPWusVTp7k3K7yi/K17XAQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tSJ26x+UjrMKTrWIDgVOuvPKquP5JEokJO3cjfgWsmg=; b=FG0UON5eTiEfUATh6MwFOYrhQscaZz5ufsHqh9lWlN+59vHXPuc9CXs2Dlo39DehOS IIBekTPKd1v9yK/JWTj8XWVdIbBk1epjbIHEc4JQ6BSCS+hF+nqo0uQjc3ntmcwHRjZI 4OKoNBz+SJl9wQ8lGCekL52cKT8h94XIbjX7EwkyVALuLRQZ7RKWrpPWLCckDQMJoDGT mIGP8haRUGIaP7xWxvkvUlwiX0muvMEw+fp+szr1sphC/3AqT+J5azT8uZoJWlM02kil yC+BqiWZ7p1sIN2kaDfy7arW3PSqJOWP7ovEk+lzZmcvpb99O3WKp+UX0hcIDACzvVxr x/dg== X-Gm-Message-State: ALyK8tL/T/b0SjoHvFpXEV4QW1QauLDtqe/nW/vWr+rc+fHFBxFSdYYSfQHyWxFnb27+nczq X-Received: by 10.98.79.90 with SMTP id d87mr931336pfb.120.1465426831747; Wed, 08 Jun 2016 16:00:31 -0700 (PDT) Received: from eswierk-sc.localdomain (67-207-112-138.static.wiline.com. [67.207.112.138]) by smtp.gmail.com with ESMTPSA id x187sm4726352pfx.87.2016.06.08.16.00.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jun 2016 16:00:31 -0700 (PDT) From: Ed Swierk To: tpmdd-devel@lists.sourceforge.net Cc: eswierk@skyportsystems.com, stefanb@us.ibm.com, jarkko.sakkinen@linux.intel.com, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, jgunthorpe@obsidianresearch.com Subject: [PATCH v5 3/4] tpm: Allow TPM chip drivers to override reported command durations Date: Wed, 8 Jun 2016 16:00:17 -0700 Message-Id: <1465426818-89356-4-git-send-email-eswierk@skyportsystems.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465426818-89356-1-git-send-email-eswierk@skyportsystems.com> References: <1465346740-60120-1-git-send-email-eswierk@skyportsystems.com> <1465426818-89356-1-git-send-email-eswierk@skyportsystems.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Some TPM chips report bogus command durations in their capabilities, just as others report incorrect timeouts. Rework tpm_get_timeouts() to allow chip drivers to override either via a single callback. Also clean up handling of TPMs that report milliseconds instead of microseconds. Signed-off-by: Ed Swierk --- drivers/char/tpm/tpm-interface.c | 177 +++++++++++++++++++++------------------ drivers/char/tpm/tpm_tis.c | 35 ++------ include/linux/tpm.h | 3 +- 3 files changed, 106 insertions(+), 109 deletions(-) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index cc1e5bc..b8a08bb 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -502,123 +502,138 @@ static int tpm_startup(struct tpm_chip *chip, __be16 startup_type) "attempting to start the TPM"); } -int tpm_get_timeouts(struct tpm_chip *chip) +static int tpm_get_cap_prop(struct tpm_chip *chip, __be32 type, int size, + cap_t *cap, char *desc) { struct tpm_cmd_t tpm_cmd; - unsigned long new_timeout[4]; - unsigned long old_timeout[4]; - struct duration_t *duration_cap; ssize_t rc; tpm_cmd.header.in = tpm_getcap_header; tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); - tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_TIMEOUT; + tpm_cmd.params.getcap_in.subcap = type; rc = tpm_transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, NULL); if (rc == TPM_ERR_INVALID_POSTINIT) { /* The TPM is not started, we are the first to talk to it. Execute a startup command. */ - dev_info(chip->pdev, "Issuing TPM_STARTUP"); + dev_info(chip->pdev, "Issuing TPM_STARTUP\n"); if (tpm_startup(chip, TPM_ST_CLEAR)) return rc; tpm_cmd.header.in = tpm_getcap_header; tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); - tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_TIMEOUT; + tpm_cmd.params.getcap_in.subcap = type; rc = tpm_transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, NULL); } + if (rc) { dev_err(chip->pdev, - "A TPM error (%zd) occurred attempting to determine the timeouts\n", - rc); - goto duration; + "Error %zd reading %s\n", rc, desc); + return -EINVAL; } if (be32_to_cpu(tpm_cmd.header.out.return_code) != 0 || be32_to_cpu(tpm_cmd.header.out.length) - != sizeof(tpm_cmd.header.out) + sizeof(u32) + 4 * sizeof(u32)) + != sizeof(tpm_cmd.header.out) + sizeof(u32) + size * sizeof(u32)) { + dev_err(chip->pdev, + "Bad return code or length reading %s\n", desc); return -EINVAL; - - old_timeout[0] = be32_to_cpu(tpm_cmd.params.getcap_out.cap.timeout.a); - old_timeout[1] = be32_to_cpu(tpm_cmd.params.getcap_out.cap.timeout.b); - old_timeout[2] = be32_to_cpu(tpm_cmd.params.getcap_out.cap.timeout.c); - old_timeout[3] = be32_to_cpu(tpm_cmd.params.getcap_out.cap.timeout.d); - memcpy(new_timeout, old_timeout, sizeof(new_timeout)); - - /* - * Provide ability for vendor overrides of timeout values in case - * of misreporting. - */ - if (chip->ops->update_timeouts != NULL) - chip->vendor.timeout_adjusted = - chip->ops->update_timeouts(chip, new_timeout); - - if (!chip->vendor.timeout_adjusted) { - /* Don't overwrite default if value is 0 */ - if (new_timeout[0] != 0 && new_timeout[0] < 1000) { - int i; - - /* timeouts in msec rather usec */ - for (i = 0; i != ARRAY_SIZE(new_timeout); i++) - new_timeout[i] *= 1000; - chip->vendor.timeout_adjusted = true; - } } - /* Report adjusted timeouts */ - if (chip->vendor.timeout_adjusted) { - dev_info(chip->pdev, - HW_ERR "Adjusting reported timeouts: A %lu->%luus B %lu->%luus C %lu->%luus D %lu->%luus\n", - old_timeout[0], new_timeout[0], - old_timeout[1], new_timeout[1], - old_timeout[2], new_timeout[2], - old_timeout[3], new_timeout[3]); - } + memcpy(cap, &tpm_cmd.params.getcap_out.cap, sizeof(cap_t)); - chip->vendor.timeout_a = usecs_to_jiffies(new_timeout[0]); - chip->vendor.timeout_b = usecs_to_jiffies(new_timeout[1]); - chip->vendor.timeout_c = usecs_to_jiffies(new_timeout[2]); - chip->vendor.timeout_d = usecs_to_jiffies(new_timeout[3]); + return 0; +} -duration: - tpm_cmd.header.in = tpm_getcap_header; - tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; - tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); - tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_DURATION; +int tpm_get_timeouts(struct tpm_chip *chip) +{ + cap_t cap1, cap2; + int rc1, rc2; + struct tpm_vendor_specific orig_vendor; + + rc1 = tpm_get_cap_prop(chip, TPM_CAP_PROP_TIS_TIMEOUT, 4, &cap1, + "timeouts"); + if (rc1 == 0) { + be32_to_cpus(&cap1.timeout.a); + be32_to_cpus(&cap1.timeout.b); + be32_to_cpus(&cap1.timeout.c); + be32_to_cpus(&cap1.timeout.d); + chip->vendor.timeout_a = usecs_to_jiffies(cap1.timeout.a); + chip->vendor.timeout_b = usecs_to_jiffies(cap1.timeout.b); + chip->vendor.timeout_c = usecs_to_jiffies(cap1.timeout.c); + chip->vendor.timeout_d = usecs_to_jiffies(cap1.timeout.d); + } + rc2 = tpm_get_cap_prop(chip, TPM_CAP_PROP_TIS_DURATION, 3, &cap2, + "durations"); + if (rc2 == 0) { + be32_to_cpus(&cap2.duration.tpm_short); + be32_to_cpus(&cap2.duration.tpm_medium); + be32_to_cpus(&cap2.duration.tpm_long); + chip->vendor.duration[TPM_SHORT] = + usecs_to_jiffies(cap2.duration.tpm_short); + chip->vendor.duration[TPM_MEDIUM] = + usecs_to_jiffies(cap2.duration.tpm_medium); + chip->vendor.duration[TPM_LONG] = + usecs_to_jiffies(cap2.duration.tpm_long); + } - rc = tpm_transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, - "attempting to determine the durations"); - if (rc) - return rc; + memcpy(&orig_vendor, &chip->vendor, sizeof(orig_vendor)); + + /* Some TPMs report timeouts in milliseconds rather than + microseconds. Use a value between 1 and 1000 as an + indication that this is the case. */ + if (rc1 == 0 && cap1.timeout.a > 0 && cap1.timeout.a < 1000) { + chip->vendor.timeout_a = msecs_to_jiffies(cap1.timeout.a); + chip->vendor.timeout_b = msecs_to_jiffies(cap1.timeout.b); + chip->vendor.timeout_c = msecs_to_jiffies(cap1.timeout.c); + chip->vendor.timeout_d = msecs_to_jiffies(cap1.timeout.d); + chip->vendor.timeout_adjusted = true; + } + /* Interpret duration values between 1 and 10000 as + milliseconds to deal with TPMs like the Broadcom BCM0102 in + the Dell Latitude D820. */ + if (rc2 == 0 && cap2.duration.tpm_short > 0 && + cap2.duration.tpm_short < 10000) { + chip->vendor.duration[TPM_SHORT] = + msecs_to_jiffies(cap2.duration.tpm_short); + chip->vendor.duration[TPM_MEDIUM] = + msecs_to_jiffies(cap2.duration.tpm_medium); + chip->vendor.duration[TPM_LONG] = + msecs_to_jiffies(cap2.duration.tpm_long); + chip->vendor.duration_adjusted = true; + } - if (be32_to_cpu(tpm_cmd.header.out.return_code) != 0 || - be32_to_cpu(tpm_cmd.header.out.length) - != sizeof(tpm_cmd.header.out) + sizeof(u32) + 3 * sizeof(u32)) - return -EINVAL; + if (chip->ops->update_timeouts != NULL) + chip->ops->update_timeouts(chip); - duration_cap = &tpm_cmd.params.getcap_out.cap.duration; - chip->vendor.duration[TPM_SHORT] = - usecs_to_jiffies(be32_to_cpu(duration_cap->tpm_short)); - chip->vendor.duration[TPM_MEDIUM] = - usecs_to_jiffies(be32_to_cpu(duration_cap->tpm_medium)); - chip->vendor.duration[TPM_LONG] = - usecs_to_jiffies(be32_to_cpu(duration_cap->tpm_long)); - - /* The Broadcom BCM0102 chipset in a Dell Latitude D820 gets the above - * value wrong and apparently reports msecs rather than usecs. So we - * fix up the resulting too-small TPM_SHORT value to make things work. - * We also scale the TPM_MEDIUM and -_LONG values by 1000. - */ - if (chip->vendor.duration[TPM_SHORT] < (HZ / 100)) { - chip->vendor.duration[TPM_SHORT] = HZ; - chip->vendor.duration[TPM_MEDIUM] *= 1000; - chip->vendor.duration[TPM_LONG] *= 1000; - chip->vendor.duration_adjusted = true; - dev_info(chip->pdev, "Adjusting TPM timeout parameters."); + if (chip->vendor.timeout_adjusted) { + dev_info(chip->pdev, + HW_ERR "Adjusted timeouts: A %u->%uus B %u->%uus" + " C %u->%uus D %u->%uus\n", + jiffies_to_usecs(orig_vendor.timeout_a), + jiffies_to_usecs(chip->vendor.timeout_a), + jiffies_to_usecs(orig_vendor.timeout_b), + jiffies_to_usecs(chip->vendor.timeout_b), + jiffies_to_usecs(orig_vendor.timeout_c), + jiffies_to_usecs(chip->vendor.timeout_c), + jiffies_to_usecs(orig_vendor.timeout_d), + jiffies_to_usecs(chip->vendor.timeout_d)); + } + if (chip->vendor.duration_adjusted) { + dev_info(chip->pdev, + HW_ERR "Adjusted durations: short %u->%uus" + " medium %u->%uus long %u->%uus\n", + jiffies_to_usecs(orig_vendor.duration[TPM_SHORT]), + jiffies_to_usecs(chip->vendor.duration[TPM_SHORT]), + jiffies_to_usecs(orig_vendor.duration[TPM_MEDIUM]), + jiffies_to_usecs(chip->vendor.duration[TPM_MEDIUM]), + jiffies_to_usecs(orig_vendor.duration[TPM_LONG]), + jiffies_to_usecs(chip->vendor.duration[TPM_LONG])); } + return 0; } EXPORT_SYMBOL_GPL(tpm_get_timeouts); diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 088fa86..caf7278 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -475,34 +475,17 @@ static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len) return rc; } -struct tis_vendor_timeout_override { - u32 did_vid; - unsigned long timeout_us[4]; -}; - -static const struct tis_vendor_timeout_override vendor_timeout_overrides[] = { - /* Atmel 3204 */ - { 0x32041114, { (TIS_SHORT_TIMEOUT*1000), (TIS_LONG_TIMEOUT*1000), - (TIS_SHORT_TIMEOUT*1000), (TIS_SHORT_TIMEOUT*1000) } }, -}; - -static bool tpm_tis_update_timeouts(struct tpm_chip *chip, - unsigned long *timeout_cap) +static void tpm_tis_update_timeouts(struct tpm_chip *chip) { - int i; - u32 did_vid; - - did_vid = ioread32(chip->vendor.iobase + TPM_DID_VID(0)); - - for (i = 0; i != ARRAY_SIZE(vendor_timeout_overrides); i++) { - if (vendor_timeout_overrides[i].did_vid != did_vid) - continue; - memcpy(timeout_cap, vendor_timeout_overrides[i].timeout_us, - sizeof(vendor_timeout_overrides[i].timeout_us)); - return true; + switch (ioread32(chip->vendor.iobase + TPM_DID_VID(0))) { + case 0x32041114: /* Atmel 3204 */ + chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT); + chip->vendor.timeout_b = msecs_to_jiffies(TIS_LONG_TIMEOUT); + chip->vendor.timeout_c = msecs_to_jiffies(TIS_SHORT_TIMEOUT); + chip->vendor.timeout_d = msecs_to_jiffies(TIS_SHORT_TIMEOUT); + chip->vendor.timeout_adjusted = true; + break; } - - return false; } /* diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 706e63e..2380ebf 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -41,8 +41,7 @@ struct tpm_class_ops { int (*send) (struct tpm_chip *chip, u8 *buf, size_t len); void (*cancel) (struct tpm_chip *chip); u8 (*status) (struct tpm_chip *chip); - bool (*update_timeouts)(struct tpm_chip *chip, - unsigned long *timeout_cap); + void (*update_timeouts)(struct tpm_chip *chip); };