diff options
| author | Manuel Lauss <manuel.lauss@gmail.com> | 2017-06-19 08:27:17 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-07-07 09:49:25 +1000 |
| commit | f128480f39166c0a4475b6937e7e3e148b1caecc (patch) | |
| tree | a7595923697af1ebe69de071052689102ffb59bb | |
| parent | 13b47cfcfc60495cde216eef4c01040d76174cbe (diff) | |
| download | op-kernel-dev-f128480f39166c0a4475b6937e7e3e148b1caecc.zip op-kernel-dev-f128480f39166c0a4475b6937e7e3e148b1caecc.tar.gz | |
tpm/tpm_crb: fix priv->cmd_size initialisation
priv->cmd_size is never initialised if the cmd and rsp buffers reside
at different addresses. Initialise it in the exit path of the function
when rsp buffer has also been successfully allocated.
Fixes: aa77ea0e43dc ("tpm/tpm_crb: cache cmd_size register value.").
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
| -rw-r--r-- | drivers/char/tpm/tpm_crb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index fe42c4a..a4ac63a 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -514,11 +514,12 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, goto out; } - priv->cmd_size = cmd_size; - priv->rsp = priv->cmd; out: + if (!ret) + priv->cmd_size = cmd_size; + crb_go_idle(dev, priv); return ret; |
