svn commit: r265986 - stable/10/crypto/openssl/ssl

[Xin LI]

Author: delphij
Date: Tue May 13 23:19:16 2014
New Revision: 265986
URL: http://svnweb.freebsd.org/changeset/base/265986

Log:
  Fix OpenSSL NULL pointer deference vulnerability.
  
  Obtained from:	OpenBSD
  Security:	FreeBSD-SA-14:09.openssl
  Security:	CVE-2014-0198

Modified:
  stable/10/crypto/openssl/ssl/s3_pkt.c

Modified: stable/10/crypto/openssl/ssl/s3_pkt.c
==============================================================================
--- stable/10/crypto/openssl/ssl/s3_pkt.c	Tue May 13 23:17:24 2014	(r265985)
+++ stable/10/crypto/openssl/ssl/s3_pkt.c	Tue May 13 23:19:16 2014	(r265986)
@@ -657,6 +657,10 @@ static int do_ssl3_write(SSL *s, int typ
 		if (i <= 0)
 			return(i);
 		/* if it went, fall through and send more stuff */
+		/* we may have released our buffer, so get it again */
+		if (wb->buf == NULL)
+			if (!ssl3_setup_write_buffer(s))
+				return -1;
 		}
 
 	if (len == 0 && !create_empty_fragment)