diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-10-21 11:53:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-10-21 11:53:00 -0400 |
| commit | 895a98dbaf9619c8a24ef872bfeca84a764a6ccb (patch) | |
| tree | a58dfa635d16841bdacc4c89a56c4d3e2e9540df | |
| parent | 52fd384a465ba91762bc4f71d239ed1e5150f947 (diff) | |
| parent | b809c265e77f4528b59aa3932a3cde8bf5e19fb3 (diff) | |
| download | tor-895a98dbaf9619c8a24ef872bfeca84a764a6ccb.tar.gz tor-895a98dbaf9619c8a24ef872bfeca84a764a6ccb.zip | |
Merge remote-tracking branch 'origin/maint-0.2.7'
| -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 156750853e..d8635675f8 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -2456,6 +2456,10 @@ dn_indicates_v3_cert(X509_NAME *name) if (len < 0) { return 0; } + if (len < 4) { + OPENSSL_free(s); + return 0; + } r = fast_memneq(s + len - 4, ".net", 4); OPENSSL_free(s); return r; |