diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-07 08:38:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-07 08:38:59 -0500 |
| commit | 05ec055c417c80bf7b13914fade70a72f11accc5 (patch) | |
| tree | 25c0779abbcda5c23f7547fd5a33adfc6e9117f1 | |
| parent | 332543baedcf651b75722e5d4626c62fdd24ef60 (diff) | |
| parent | 51675f97d30e48da68f2cf538f7f805f51af4c36 (diff) | |
| download | tor-05ec055c417c80bf7b13914fade70a72f11accc5.tar.gz tor-05ec055c417c80bf7b13914fade70a72f11accc5.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
| -rw-r--r-- | changes/bug17404 | 6 | ||||
| -rw-r--r-- | src/common/tortls.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changes/bug17404 b/changes/bug17404 new file mode 100644 index 0000000000..d524f6662d --- /dev/null +++ b/changes/bug17404 @@ -0,0 +1,6 @@ + o Major bugfixes (security, correctness): + - Fix a programming error that could cause us to read 4 bytes before + the beginning of an openssl string. This could be used to provoke + a crash on systems with an unusual malloc implementation, or + systems with unsual hardening installed. Fixes bug 17404; bugfix + on 0.2.3.6-alpha. diff --git a/src/common/tortls.c b/src/common/tortls.c index d637a8e4d9..221b47e009 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -2708,6 +2708,10 @@ dn_indicates_v3_cert(X509_NAME *name) len = ASN1_STRING_to_UTF8(&s, str); if (len < 0) return 0; + if (len < 4) { + OPENSSL_free(s); + return 1; + } r = fast_memneq(s + len - 4, ".net", 4); OPENSSL_free(s); return r; |