All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrey Pronin <apronin@chromium.org>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: Peter Huewe <peterhuewe@gmx.de>,
	Marcel Selhorst <tpmdd@selhorst.net>,
	Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
	tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org,
	Christophe Ricard <christophe.ricard@gmail.com>,
	dtor@chromium.org, smbarber@chromium.org, dianders@chromium.org,
	Andrey Pronin <apronin@chromium.org>
Subject: [PATCH v3 1/2] tpm_tis_core: add optional max xfer size check
Date: Wed, 27 Jul 2016 20:49:56 -0700	[thread overview]
Message-ID: <1469677797-74304-2-git-send-email-apronin@chromium.org> (raw)
In-Reply-To: <1469677797-74304-1-git-send-email-apronin@chromium.org>
In-Reply-To: <1468546745-14646-1-git-send-email-apronin@chromium.org>

If tpm reports a bigger burstcnt than allowed by the physical protocol,
set burstcnt to the max allowed value.

In practice, seen in case of xfer issues (e.g. in spi interface case,
lost header causing flow control issues and wrong values returned on read
from TPM_STS). Without catching, causes the physical layer to reject xfer.

Signed-off-by: Andrey Pronin <apronin@chromium.org>
---
 drivers/char/tpm/tpm_tis_core.c | 9 ++++++++-
 drivers/char/tpm/tpm_tis_core.h | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index f22caf8..7c4fa0c 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -168,8 +168,15 @@ static int get_burstcount(struct tpm_chip *chip)
 			return rc;
 
 		burstcnt = (value >> 8) & 0xFFFF;
-		if (burstcnt)
+		if (burstcnt) {
+			if (priv->phy_ops->max_xfer_size &&
+			    (burstcnt > priv->phy_ops->max_xfer_size)) {
+				dev_warn(&chip->dev,
+					 "Bad burstcnt read: %d\n", burstcnt);
+				burstcnt = priv->phy_ops->max_xfer_size;
+			}
 			return burstcnt;
+		}
 		msleep(TPM_TIMEOUT);
 	} while (time_before(jiffies, stop));
 	return -EBUSY;
diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h
index 9191aab..58e8b14 100644
--- a/drivers/char/tpm/tpm_tis_core.h
+++ b/drivers/char/tpm/tpm_tis_core.h
@@ -102,6 +102,7 @@ struct tpm_tis_phy_ops {
 	int (*read16)(struct tpm_tis_data *data, u32 addr, u16 *result);
 	int (*read32)(struct tpm_tis_data *data, u32 addr, u32 *result);
 	int (*write32)(struct tpm_tis_data *data, u32 addr, u32 src);
+	u16 max_xfer_size;
 };
 
 static inline int tpm_tis_read_bytes(struct tpm_tis_data *data, u32 addr,
-- 
2.6.6

WARNING: multiple messages have this Message-ID
From: Andrey Pronin <apronin-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
To: Jarkko Sakkinen
	<jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Cc: Christophe Ricard
	<christophe.ricard-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	smbarber-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org,
	tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org,
	dtor-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org
Subject: [PATCH v3 1/2] tpm_tis_core: add optional max xfer size check
Date: Wed, 27 Jul 2016 20:49:56 -0700	[thread overview]
Message-ID: <1469677797-74304-2-git-send-email-apronin@chromium.org> (raw)
In-Reply-To: <1469677797-74304-1-git-send-email-apronin-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
In-Reply-To: <1468546745-14646-1-git-send-email-apronin-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>

If tpm reports a bigger burstcnt than allowed by the physical protocol,
set burstcnt to the max allowed value.

In practice, seen in case of xfer issues (e.g. in spi interface case,
lost header causing flow control issues and wrong values returned on read
from TPM_STS). Without catching, causes the physical layer to reject xfer.

Signed-off-by: Andrey Pronin <apronin-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
---
 drivers/char/tpm/tpm_tis_core.c | 9 ++++++++-
 drivers/char/tpm/tpm_tis_core.h | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index f22caf8..7c4fa0c 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -168,8 +168,15 @@ static int get_burstcount(struct tpm_chip *chip)
 			return rc;
 
 		burstcnt = (value >> 8) & 0xFFFF;
-		if (burstcnt)
+		if (burstcnt) {
+			if (priv->phy_ops->max_xfer_size &&
+			    (burstcnt > priv->phy_ops->max_xfer_size)) {
+				dev_warn(&chip->dev,
+					 "Bad burstcnt read: %d\n", burstcnt);
+				burstcnt = priv->phy_ops->max_xfer_size;
+			}
 			return burstcnt;
+		}
 		msleep(TPM_TIMEOUT);
 	} while (time_before(jiffies, stop));
 	return -EBUSY;
diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h
index 9191aab..58e8b14 100644
--- a/drivers/char/tpm/tpm_tis_core.h
+++ b/drivers/char/tpm/tpm_tis_core.h
@@ -102,6 +102,7 @@ struct tpm_tis_phy_ops {
 	int (*read16)(struct tpm_tis_data *data, u32 addr, u16 *result);
 	int (*read32)(struct tpm_tis_data *data, u32 addr, u32 *result);
 	int (*write32)(struct tpm_tis_data *data, u32 addr, u32 src);
+	u16 max_xfer_size;
 };
 
 static inline int tpm_tis_read_bytes(struct tpm_tis_data *data, u32 addr,
-- 
2.6.6


------------------------------------------------------------------------------

  reply	other threads:[~2016-07-28  3:50 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-15  1:39 [PATCH 0/2] tpm: " Andrey Pronin
2016-07-15  1:39 ` [PATCH 1/2] tpm_tis_core: " Andrey Pronin
2016-07-15  3:13   ` Jason Gunthorpe
2016-07-15  3:13     ` Jason Gunthorpe
2016-07-15  3:25     ` Andrey Pronin
2016-07-15  3:48       ` Guenter Roeck
2016-07-18 18:53     ` Jarkko Sakkinen
2016-07-18 18:53       ` Jarkko Sakkinen
2016-07-15  1:39 ` [PATCH 2/2] tpm_tis_spi: add max xfer size Andrey Pronin
2016-07-15  1:39   ` Andrey Pronin
2016-07-20  2:34 ` [PATCH v2 0/2] tpm: add optional max xfer size check Andrey Pronin
2016-07-20  2:34   ` Andrey Pronin
2016-07-20  2:34   ` [PATCH v2 1/2] tpm_tis_core: " Andrey Pronin
2016-07-20  2:34     ` Andrey Pronin
2016-07-20  2:34   ` [PATCH v2 2/2] tpm_tis_spi: add max xfer size Andrey Pronin
2016-07-20 15:10   ` [PATCH v2 0/2] tpm: add optional max xfer size check Jarkko Sakkinen
2016-07-20 15:10     ` Jarkko Sakkinen
2016-07-28  3:49 ` [PATCH v3 " Andrey Pronin
2016-07-28  3:49   ` Andrey Pronin
2016-07-28  3:49   ` Andrey Pronin [this message]
2016-07-28  3:49     ` [PATCH v3 1/2] tpm_tis_core: " Andrey Pronin
2016-07-28 22:52     ` Dmitry Torokhov
2016-08-09  8:14     ` Jarkko Sakkinen
2016-08-09  8:14       ` Jarkko Sakkinen
2020-11-19 10:00       ` Dafna Hirschfeld
2020-11-20 15:15         ` Jarkko Sakkinen
2016-07-28  3:49   ` [PATCH v3 2/2] tpm_tis_spi: add max xfer size Andrey Pronin
2016-07-28  3:49     ` Andrey Pronin
2016-07-28 22:53     ` Dmitry Torokhov
2016-08-09  8:14       ` Jarkko Sakkinen
2016-08-09  8:14         ` Jarkko Sakkinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1469677797-74304-2-git-send-email-apronin@chromium.org \
    --to=apronin@chromium.org \
    --cc=christophe.ricard@gmail.com \
    --cc=dianders@chromium.org \
    --cc=dtor@chromium.org \
    --cc=jarkko.sakkinen@linux.intel.com \
    --cc=jgunthorpe@obsidianresearch.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peterhuewe@gmx.de \
    --cc=smbarber@chromium.org \
    --cc=tpmdd-devel@lists.sourceforge.net \
    --cc=tpmdd@selhorst.net \
    --subject='Re: [PATCH v3 1/2] tpm_tis_core: add optional max xfer size check' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.