* [PATCH] tpm: missing tpm_chip_put in tpm_get_random()
@ 2014-05-09 11:23 Jarkko Sakkinen
2014-05-09 16:22 ` [tpmdd-devel] " Jason Gunthorpe
0 siblings, 1 reply; 2+ messages in thread
From: Jarkko Sakkinen @ 2014-05-09 11:23 UTC (permalink / raw)
To: peterhuewe, tpmdd-devel; +Cc: linux-kernel, Jarkko Sakkinen
Regression in 41ab999c. Call to tpm_chip_put is missing. This
will cause TPM device driver not to unload if tmp_get_random()
is called.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
drivers/char/tpm/tpm-interface.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 62e10fd..4ea4d52 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -991,13 +991,13 @@ int tpm_get_random(u32 chip_num, u8 *out, size_t max)
int err, total = 0, retries = 5;
u8 *dest = out;
+ if (!out || !num_bytes || max > TPM_MAX_RNG_DATA)
+ return -EINVAL;
+
chip = tpm_chip_find_get(chip_num);
if (chip == NULL)
return -ENODEV;
- if (!out || !num_bytes || max > TPM_MAX_RNG_DATA)
- return -EINVAL;
-
do {
tpm_cmd.header.in = tpm_getrandom_header;
tpm_cmd.params.getrandom_in.num_bytes = cpu_to_be32(num_bytes);
@@ -1016,6 +1016,7 @@ int tpm_get_random(u32 chip_num, u8 *out, size_t max)
num_bytes -= recd;
} while (retries-- && total < max);
+ tpm_chip_put(chip);
return total ? total : -EIO;
}
EXPORT_SYMBOL_GPL(tpm_get_random);
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [tpmdd-devel] [PATCH] tpm: missing tpm_chip_put in tpm_get_random()
2014-05-09 11:23 [PATCH] tpm: missing tpm_chip_put in tpm_get_random() Jarkko Sakkinen
@ 2014-05-09 16:22 ` Jason Gunthorpe
0 siblings, 0 replies; 2+ messages in thread
From: Jason Gunthorpe @ 2014-05-09 16:22 UTC (permalink / raw)
To: Jarkko Sakkinen; +Cc: peterhuewe, tpmdd-devel, linux-kernel
On Fri, May 09, 2014 at 02:23:10PM +0300, Jarkko Sakkinen wrote:
> Regression in 41ab999c. Call to tpm_chip_put is missing. This
> will cause TPM device driver not to unload if tmp_get_random()
> is called.
>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> drivers/char/tpm/tpm-interface.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index 62e10fd..4ea4d52 100644
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -991,13 +991,13 @@ int tpm_get_random(u32 chip_num, u8 *out, size_t max)
> int err, total = 0, retries = 5;
> u8 *dest = out;
>
> + if (!out || !num_bytes || max > TPM_MAX_RNG_DATA)
> + return -EINVAL;
> +
> chip = tpm_chip_find_get(chip_num);
> if (chip == NULL)
> return -ENODEV;
>
> - if (!out || !num_bytes || max > TPM_MAX_RNG_DATA)
> - return -EINVAL;
> -
> do {
> tpm_cmd.header.in = tpm_getrandom_header;
> tpm_cmd.params.getrandom_in.num_bytes = cpu_to_be32(num_bytes);
> @@ -1016,6 +1016,7 @@ int tpm_get_random(u32 chip_num, u8 *out, size_t max)
> num_bytes -= recd;
> } while (retries-- && total < max);
>
> + tpm_chip_put(chip);
> return total ? total : -EIO;
> }
> EXPORT_SYMBOL_GPL(tpm_get_random);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-09 16:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-09 11:23 [PATCH] tpm: missing tpm_chip_put in tpm_get_random() Jarkko Sakkinen
2014-05-09 16:22 ` [tpmdd-devel] " Jason Gunthorpe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).