summaryrefslogtreecommitdiffstats
path: root/ssl/d1_both.c
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:23 +0100
commitde2422affbe24262496f477edeb1c04017907eb4 (patch)
tree4b49610696a1841a99a7752bc4389e96c59a1ea7 /ssl/d1_both.c
parent897169fdf06bf75b4d0c503d61abb45656dd90a6 (diff)
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.
Diffstat (limited to 'ssl/d1_both.c')
-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 3426a0a5f3..61867b3e33 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -787,6 +787,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)
{
@@ -845,8 +846,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 */
{