commit 36ca21415a0ef94f304ba174700e53d48aaa58ab
author Martin Kreichgauer <martinkr@google.com> Wed Dec 14 13:44:10 2016 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Dec 14 21:59:18 2016 +0000
tree 0f556a6b1127e36b77ffb54922b5d480e0ce054f
parent 4cc1ccd3fc603ac8497b9bb15fac35e94095ba0a

crypto/rand: Fix a crash bug in RAND_enable_fork_unsafe_buffering.

Change-Id: Ifff59b1518f513c1be70e4e0d4ed3430741d0a5e
Reviewed-on: https://boringssl-review.googlesource.com/12860
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

crypto/rand/urandom.c

diff --git a/crypto/rand/urandom.c b/crypto/rand/urandom.c
index 17d194c..14d2e8a 100644
--- a/crypto/rand/urandom.c
+++ b/crypto/rand/urandom.c
@@ -207,12 +207,12 @@
     abort();  // Already initialized
   }
 
-  if (urandom_fd == kHaveGetrandom) {
-    if (fd >= 0) {
+  if (fd >= 0) {
+    if (urandom_fd == kHaveGetrandom) {
       close(fd);
+    } else if (urandom_fd != fd) {
+      abort();  // Already initialized.
     }
-  } else if (urandom_fd != fd) {
-    abort();  // Already initialized.
   }
 }