[tpmdd-devel] (no subject)

[Peter H. <pet...@gm...>]

tpm...@li...,
	Jarkko Sakkinen <jar...@li...>,
	<st...@vg...>,
	Peter Huewe <pet...@gm...>
Subject: [PATCH 3/5] tpm: missing tpm_chip_put in tpm_get_random()
Date: Tue, 29 Jul 2014 23:25:40 +0200
Message-Id: <140...@gm...>
X-Mailer: git-send-email 1.8.5.5
In-Reply-To: <140...@gm...>
References: <201...@gm...>
 <140...@gm...>
X-Provags-ID:  V03:K0:CzrDQ1IEfd4LXlFvQHdqPC4ZazeldH/euUCOtxy+sPpZpbWDcoD
 n4iOFJsq3rM4eseWMA9qR/rKfZlp3SyJcKzk7grUfsy+PHyJ3iQ0iWf4HTZ2Uc5RB8tyUgs
 Se8KK+5QYfBOoQHYk4e0bhQSpF+097dDi2p+vbIHSlZTPqGctq2mgktKOit+3DV5m76ZRh/
 y0ldU1IPFTtvHinXTTwoQ==

From: Jarkko Sakkinen <jar...@li...>

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.

Cc: <st...@vg...> # 3.7+
Signed-off-by: Jarkko Sakkinen <jar...@li...>
Signed-off-by: Peter Huewe <pet...@gm...>
---
 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 d175fb8..bef6cce 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.8.5.5