From: jsing <jsing@openbsd.org>
Date: Tue, 29 Jun 2021 18:43:49 +0000 (+0000)
Subject: Reject zero-length non-application data fragments in the legacy stack.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=51bf8b95899638b0c83ee1dd51fdedf9f3ef6197;p=openbsd

Reject zero-length non-application data fragments in the legacy stack.

Per RFC 5246 section 6.2.1, zero-length fragments are only permitted for
application data - reject all others.

Reported via GitHub issue #675.

ok inoguchi@ tb@
---

diff --git a/lib/libssl/ssl_pkt.c b/lib/libssl/ssl_pkt.c
index e959ccaf2fa..7f655adfe62 100644
--- a/lib/libssl/ssl_pkt.c
+++ b/lib/libssl/ssl_pkt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_pkt.c,v 1.44 2021/06/13 15:34:41 jsing Exp $ */
+/* $OpenBSD: ssl_pkt.c,v 1.45 2021/06/29 18:43:49 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -429,6 +429,16 @@ ssl3_get_record(SSL *s)
 	s->internal->packet_length = 0;
 
 	if (rr->length == 0) {
+		/*
+		 * Zero-length fragments are only permitted for application
+		 * data, as per RFC 5246 section 6.2.1.
+		 */
+		if (rr->type != SSL3_RT_APPLICATION_DATA) {
+			SSLerror(s, SSL_R_BAD_LENGTH);
+			al = SSL_AD_UNEXPECTED_MESSAGE;
+			goto fatal_err;
+		}
+
 		/*
 		 * CBC countermeasures for known IV weaknesses can legitimately
 		 * insert a single empty record, so we allow ourselves to read