diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2014-05-16 13:00:45 +0100 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2014-06-05 13:24:36 +0100 |
commit | 8942b92c7cb5fa144bd79b7607b459d0b777164c (patch) | |
tree | c5083db48385767c9df2103fda66422d2c939e0a /ssl | |
parent | e5f706590c7b1f19ca34415593aebdb6cbef355b (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.
(cherry picked from commit d3152655d5319ce883c8e3ac4b99f8de4c59d846)
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/d1_both.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c index 2c06fc28f7..820c8f08fa 100644 --- a/ssl/d1_both.c +++ b/ssl/d1_both.c @@ -789,6 +789,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) { @@ -847,8 +848,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 */ { |