Re: [PATCH] ansi_cprng: Fix off by one error in non-block size request

2013-09-23 Thread Herbert Xu
On Tue, Sep 17, 2013 at 08:33:11AM -0400, Neil Horman wrote:
 Stephan Mueller reported to me recently a error in random number generation in
 the ansi cprng. If several small requests are made that are less than the
 instances block size, the remainder for loop code doesn't increment
 rand_data_valid in the last iteration, meaning that the last bytes in the
 rand_data buffer gets reused on the subsequent smaller-than-a-block request 
 for
 random data.
 
 The fix is pretty easy, just re-code the for loop to make sure that
 rand_data_valid gets incremented appropriately
 
 Signed-off-by: Neil Horman nhor...@tuxdriver.com
 Reported-by: Stephan Mueller stephan.muel...@atsec.com
 CC: Stephan Mueller stephan.muel...@atsec.com
 CC: Petr Matousek pmato...@redhat.com
 CC: Herbert Xu herb...@gondor.apana.org.au
 CC: David S. Miller da...@davemloft.net

Patch applied.  Thanks.
-- 
Email: Herbert Xu herb...@gondor.apana.org.au
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line unsubscribe linux-crypto in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] ansi_cprng: Fix off by one error in non-block size request

2013-09-17 Thread Neil Horman
Stephan Mueller reported to me recently a error in random number generation in
the ansi cprng. If several small requests are made that are less than the
instances block size, the remainder for loop code doesn't increment
rand_data_valid in the last iteration, meaning that the last bytes in the
rand_data buffer gets reused on the subsequent smaller-than-a-block request for
random data.

The fix is pretty easy, just re-code the for loop to make sure that
rand_data_valid gets incremented appropriately

Signed-off-by: Neil Horman nhor...@tuxdriver.com
Reported-by: Stephan Mueller stephan.muel...@atsec.com
CC: Stephan Mueller stephan.muel...@atsec.com
CC: Petr Matousek pmato...@redhat.com
CC: Herbert Xu herb...@gondor.apana.org.au
CC: David S. Miller da...@davemloft.net
---
 crypto/ansi_cprng.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c
index c0bb377..666f196 100644
--- a/crypto/ansi_cprng.c
+++ b/crypto/ansi_cprng.c
@@ -230,11 +230,11 @@ remainder:
 */
if (byte_count  DEFAULT_BLK_SZ) {
 empty_rbuf:
-   for (; ctx-rand_data_valid  DEFAULT_BLK_SZ;
-   ctx-rand_data_valid++) {
+   while (ctx-rand_data_valid  DEFAULT_BLK_SZ) {
*ptr = ctx-rand_data[ctx-rand_data_valid];
ptr++;
byte_count--;
+   ctx-rand_data_valid++;
if (byte_count == 0)
goto done;
}
-- 
1.8.3.1

--
To unsubscribe from this list: send the line unsubscribe linux-crypto in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html