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

ERR_clear_error at the end of each fuzzer.

Browse Source 
Data allocated in one fuzzer iteration and then freed in the next
complicates the leak checker. Avoid this by dropping hidden global state
at the end of each run.

Change-Id: Ice79704f2754a6b1f40e288df9b97ddd5b3b97d5
Reviewed-on: https://boringssl-review.googlesource.com/11600
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2016-10-13 19:03:17 -04:00 committed by Adam Langley
parent 1991af6900
commit 4c0e6c64b6
8 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuzz/cert.cc
View File

@ -12,6 +12,7 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
#include <openssl/err.h>
#include <openssl/mem.h> #include <openssl/mem.h>
#include <openssl/x509.h> #include <openssl/x509.h>
@ -27,5 +28,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
OPENSSL_free(der); OPENSSL_free(der);
} }
X509_free(x509); X509_free(x509);
ERR_clear_error();
return 0; return 0;
} }

2
fuzz/client.cc
View File

@ -15,6 +15,7 @@
#include <assert.h> #include <assert.h>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
@ -290,5 +291,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
} }
SSL_free(client); SSL_free(client);
ERR_clear_error();
return 0; return 0;
} }

2
fuzz/pkcs8.cc
View File

@ -13,6 +13,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
#include <openssl/bytestring.h> #include <openssl/bytestring.h>
#include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/mem.h> #include <openssl/mem.h>
@ -34,5 +35,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
} }
CBB_cleanup(&cbb); CBB_cleanup(&cbb);
EVP_PKEY_free(pkey); EVP_PKEY_free(pkey);
ERR_clear_error();
return 0; return 0;
} }

2
fuzz/privkey.cc
View File

@ -12,9 +12,11 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
#include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) { extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
EVP_PKEY_free(d2i_AutoPrivateKey(NULL, &buf, len)); EVP_PKEY_free(d2i_AutoPrivateKey(NULL, &buf, len));
ERR_clear_error();
return 0; return 0;
} }

4
fuzz/read_pem.cc
View File

@ -12,7 +12,8 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
#include <openssl/crypto.h> #include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/mem.h> #include <openssl/mem.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -32,5 +33,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
BIO_free(bio); BIO_free(bio);
ERR_clear_error();
return 0; return 0;
} }

2
fuzz/server.cc
View File

@ -16,6 +16,7 @@
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/dh.h> #include <openssl/dh.h>
#include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
@ -289,5 +290,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
} }
SSL_free(server); SSL_free(server);
ERR_clear_error();
return 0; return 0;
} }

3
fuzz/spki.cc
View File

@ -13,6 +13,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
#include <openssl/bytestring.h> #include <openssl/bytestring.h>
#include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/mem.h> #include <openssl/mem.h>
@ -21,6 +22,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
CBS_init(&cbs, buf, len); CBS_init(&cbs, buf, len);
EVP_PKEY *pkey = EVP_parse_public_key(&cbs); EVP_PKEY *pkey = EVP_parse_public_key(&cbs);
if (pkey == NULL) { if (pkey == NULL) {
ERR_clear_error();
return 0; return 0;
} }
@ -34,5 +36,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
} }
CBB_cleanup(&cbb); CBB_cleanup(&cbb);
EVP_PKEY_free(pkey); EVP_PKEY_free(pkey);
ERR_clear_error();
return 0; return 0;
} }

1
fuzz/ssl_ctx_api.cc
View File

@ -19,6 +19,7 @@
#include <assert.h> #include <assert.h>
#include <openssl/bytestring.h> #include <openssl/bytestring.h>
#include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>