diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-12-02 11:39:56 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-12-02 11:39:56 -0500 |
| commit | 4867d69d3c59c375388f252b19029cf52812f69d (patch) | |
| tree | 7f78cc28e7cc5caeb5f987b84f1cc65568aa8afe /crypto | |
| parent | 8b0a38c2139faea3cba3ad9c48232dea445da440 (diff) | |
| parent | 43d8b1ef8250705d07fadceefa44f91b32e08328 (diff) | |
Merge tag 'v3.10.21' into v3.10-rt
This is the 3.10.21 stable release
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ansi_cprng.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c index c0bb3778f1ae..666f1962a160 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; } |