All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] tpm: tpm_crb: relinquish locality on error path.
@ 2018-04-07 16:12 ` Tomas Winkler
  0 siblings, 0 replies; 38+ messages in thread
From: Tomas Winkler @ 2018-04-07 16:12 UTC (permalink / raw)
  To: Jarkko Sakkinen, Jason Gunthorpe
  Cc: Alexander Usyskin, linux-integrity, linux-security-module,
	linux-kernel, Tomas Winkler

In crb_map_io() function, __crb_request_locality() is called prior
to crb_cmd_ready(), but if one of the consecutive function fails
the flow bails out instead of trying to relinquish locality.
This patch adds goto jump to __crb_relinquish_locality() on the error path.

Fixes: 888d867df441 (tpm: cmd_ready command can be issued only after granting locality)
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/char/tpm/tpm_crb.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index 7f78482cd157..34fbc6cb097b 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -511,8 +511,10 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,
 
 	priv->regs_t = crb_map_res(dev, priv, &io_res, buf->control_address,
 				   sizeof(struct crb_regs_tail));
-	if (IS_ERR(priv->regs_t))
-		return PTR_ERR(priv->regs_t);
+	if (IS_ERR(priv->regs_t)) {
+		ret = PTR_ERR(priv->regs_t);
+		goto out_relinquish_locality;
+	}
 
 	/*
 	 * PTT HW bug w/a: wake up the device to access
@@ -520,7 +522,7 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,
 	 */
 	ret = crb_cmd_ready(dev, priv);
 	if (ret)
-		return ret;
+		goto out_relinquish_locality;
 
 	pa_high = ioread32(&priv->regs_t->ctrl_cmd_pa_high);
 	pa_low  = ioread32(&priv->regs_t->ctrl_cmd_pa_low);
@@ -565,6 +567,8 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,
 
 	crb_go_idle(dev, priv);
 
+out_relinquish_locality:
+
 	__crb_relinquish_locality(dev, priv, 0);
 
 	return ret;
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 38+ messages in thread

end of thread, other threads:[~2018-05-11 10:18 UTC | newest]

Thread overview: 38+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-07 16:12 [PATCH] tpm: tpm_crb: relinquish locality on error path Tomas Winkler
2018-04-07 16:12 ` Tomas Winkler
2018-04-09 11:13 ` Jarkko Sakkinen
2018-04-09 11:13   ` Jarkko Sakkinen
2018-04-10  9:00   ` Winkler, Tomas
2018-04-10  9:00     ` Winkler, Tomas
2018-04-10 12:33     ` Jarkko Sakkinen
2018-04-10 12:33       ` Jarkko Sakkinen
2018-04-10 20:25       ` Winkler, Tomas
2018-04-10 20:25         ` Winkler, Tomas
2018-04-20 13:19         ` Winkler, Tomas
2018-04-20 13:19           ` Winkler, Tomas
2018-04-24 16:03           ` Jarkko Sakkinen
2018-04-24 16:03             ` Jarkko Sakkinen
2018-04-24 17:48             ` Jarkko Sakkinen
2018-04-24 17:48               ` Jarkko Sakkinen
2018-04-24 20:10               ` Winkler, Tomas
2018-04-24 20:10                 ` Winkler, Tomas
2018-04-24 20:04             ` Winkler, Tomas
2018-04-24 20:04               ` Winkler, Tomas
2018-05-02 13:32               ` Jarkko Sakkinen
2018-05-02 13:32                 ` Jarkko Sakkinen
2018-05-02 13:35                 ` Winkler, Tomas
2018-05-02 13:35                   ` Winkler, Tomas
2018-05-03  6:35                   ` Jarkko Sakkinen
2018-05-03  6:35                     ` Jarkko Sakkinen
2018-05-03  6:42                     ` Winkler, Tomas
2018-05-03  6:42                       ` Winkler, Tomas
2018-05-04  8:16                       ` Jarkko Sakkinen
2018-05-04  8:16                         ` Jarkko Sakkinen
2018-05-05 21:07                         ` Winkler, Tomas
2018-05-05 21:07                           ` Winkler, Tomas
2018-05-09 12:26                           ` Jarkko Sakkinen
2018-05-09 12:26                             ` Jarkko Sakkinen
2018-05-09 21:49                             ` Winkler, Tomas
2018-05-09 21:49                               ` Winkler, Tomas
2018-05-11 10:18                               ` Jarkko Sakkinen
2018-05-11 10:18                                 ` Jarkko Sakkinen

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.