aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-05-16 13:00:45 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-06-03 16:30:37 +0100
commit519c977c47b30d5ca24000b146c0e0bbb360279e (patch)
tree4cedda5cdf51f877199c571f12f2a094deb7a9da
parent123370fb9437e016b5a5192166ad027b90c73d9b (diff)
downloadopenssl-519c977c47b30d5ca24000b146c0e0bbb360279e.zip
openssl-519c977c47b30d5ca24000b146c0e0bbb360279e.tar.gz
openssl-519c977c47b30d5ca24000b146c0e0bbb360279e.tar.bz2
Fix CVE-2014-0221
Unnecessary recursion when receiving a DTLS hello request can be used to crash a DTLS client. Fixed by handling DTLS hello request without recursion. Thanks to Imre Rad (Search-Lab Ltd.) for discovering this issue.
-rw-r--r--ssl/d1_both.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index da8d1b1..f4fc5bc 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -793,6 +793,7 @@ dtls1_get_message_fragment(SSL *s, int st1, int stn, long max, int *ok)
int i,al;
struct hm_header_st msg_hdr;
+ redo:
/* see if we have the required fragment already */
if ((frag_len = dtls1_retrieve_buffered_fragment(s,max,ok)) || *ok)
{
@@ -851,8 +852,7 @@ dtls1_get_message_fragment(SSL *s, int st1, int stn, long max, int *ok)
s->msg_callback_arg);
s->init_num = 0;
- return dtls1_get_message_fragment(s, st1, stn,
- max, ok);
+ goto redo;
}
else /* Incorrectly formated Hello request */
{