summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2014-04-30 04:02:36 +0000
committerdelphij <delphij@FreeBSD.org>2014-04-30 04:02:36 +0000
commit7e64659205e21c5bb172747f4b23e09970b9717f (patch)
treed1bfb0d727680d12cec2e1f973149bb2bad0534d /crypto
parenta9a542b515422b887b43085de6c5d2bfcc191cad (diff)
downloadFreeBSD-src-7e64659205e21c5bb172747f4b23e09970b9717f.zip
FreeBSD-src-7e64659205e21c5bb172747f4b23e09970b9717f.tar.gz
Fix OpenSSL use-after-free vulnerability.
Obtained from: OpenBSD Security: FreeBSD-SA-14:09.openssl Security: CVE-2010-5298
Diffstat (limited to 'crypto')
-rw-r--r--crypto/openssl/ssl/s3_pkt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s3_pkt.c b/crypto/openssl/ssl/s3_pkt.c
index 96ba632..8deeab3 100644
--- a/crypto/openssl/ssl/s3_pkt.c
+++ b/crypto/openssl/ssl/s3_pkt.c
@@ -1055,7 +1055,7 @@ start:
{
s->rstate=SSL_ST_READ_HEADER;
rr->off=0;
- if (s->mode & SSL_MODE_RELEASE_BUFFERS)
+ if (s->mode & SSL_MODE_RELEASE_BUFFERS && s->s3->rbuf.left == 0)
ssl3_release_read_buffer(s);
}
}
OpenPOWER on IntegriCloud