[prev in list] [next in list] [prev in thread] [next in thread]
List: tpmdd-devel
Subject: Re: [tpmdd-devel] [PATCH] tpm: missing tpm_chip_put in tpm_get_random()
From: Jason Gunthorpe <jgunthorpe () obsidianresearch ! com>
Date: 2014-05-09 16:22:36
Message-ID: 20140509162235.GA16647 () obsidianresearch ! com
[Download RAW message or body]
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);
------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
• 3 signs your SCM is hindering your productivity
• Requirements for releasing software faster
• Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic