kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't overflow state->calls on 16TiB RAND_bytes calls.

Browse Source 
This is an extremely important and practical use case. The comment that
state->calls is bounded by the reseed interval isn't quite true. We only
check on entry to the function, which means that it may exceed it by one
call's worth. Switch it to a size_t (which doesn't actually increase
memory because the struct was already padded).

Change-Id: Ia7646fd5b4142789c1d613280223baa4cd1a4a9b
Reviewed-on: https://boringssl-review.googlesource.com/c/32804
Commit-Queue: David Benjamin <davidben@google.com>
Commit-Queue: Adam Langley <agl@google.com>
Reviewed-by: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2018-11-02 13:19:20 -05:00 committed by CQ bot account: commit-bot@chromium.org
parent cc9d935256
commit e62bf02a13
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/fipsmodule/rand/rand.c
View File

@ -109,8 +109,9 @@ struct rand_state {
// next forms a NULL-terminated linked-list of all free |rand_state| objects. // next forms a NULL-terminated linked-list of all free |rand_state| objects.
struct rand_state *next; struct rand_state *next;
// calls is the number of generate calls made on |drbg| since it was last // calls is the number of generate calls made on |drbg| since it was last
// (re)seeded. This is bound by |kReseedInterval|. // (re)seeded. This is bound by
unsigned calls; // |kReseedInterval - 1 + SIZE_MAX / CTR_DRBG_MAX_GENERATE_LENGTH|.
size_t calls;
#if defined(BORINGSSL_FIPS) #if defined(BORINGSSL_FIPS)
// next_all forms another NULL-terminated linked-list, this time of all // next_all forms another NULL-terminated linked-list, this time of all
@ -351,6 +352,8 @@ void RAND_bytes_with_additional_data(uint8_t *out, size_t out_len,
out += todo; out += todo;
out_len -= todo; out_len -= todo;
// Though we only check before entering the loop, this cannot add enough to
// overflow a |size_t|.
state->calls++; state->calls++;
first_call = 0; first_call = 0;
} }