Blame SOURCES/openssl-1.0.1e-cve-2014-0221.patch
|
 |
ff4ef5 |
commit d30e582446b027868cdabd0994681643682045a4
|
|
|
ff4ef5 |
Author: Dr. Stephen Henson <steve@openssl.org>
|
|
|
ff4ef5 |
Date: Fri May 16 13:00:45 2014 +0100
|
|
|
ff4ef5 |
|
|
|
ff4ef5 |
Fix CVE-2014-0221
|
|
|
ff4ef5 |
|
|
|
ff4ef5 |
Unnecessary recursion when receiving a DTLS hello request can be used to
|
|
|
ff4ef5 |
crash a DTLS client. Fixed by handling DTLS hello request without recursion.
|
|
|
ff4ef5 |
|
|
|
ff4ef5 |
Thanks to Imre Rad (Search-Lab Ltd.) for discovering this issue.
|
|
|
ff4ef5 |
|
|
|
ff4ef5 |
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
|
|
|
ff4ef5 |
index 07f67f8..4c2fd03 100644
|
|
|
ff4ef5 |
--- a/ssl/d1_both.c
|
|
|
ff4ef5 |
+++ b/ssl/d1_both.c
|
|
|
ff4ef5 |
@@ -793,6 +793,7 @@ dtls1_get_message_fragment(SSL *s, int st1, int stn, long max, int *ok)
|
|
|
ff4ef5 |
int i,al;
|
|
|
ff4ef5 |
struct hm_header_st msg_hdr;
|
|
|
ff4ef5 |
|
|
|
ff4ef5 |
+ redo:
|
|
|
ff4ef5 |
/* see if we have the required fragment already */
|
|
|
ff4ef5 |
if ((frag_len = dtls1_retrieve_buffered_fragment(s,max,ok)) || *ok)
|
|
|
ff4ef5 |
{
|
|
|
ff4ef5 |
@@ -851,8 +852,7 @@ dtls1_get_message_fragment(SSL *s, int st1, int stn, long max, int *ok)
|
|
|
ff4ef5 |
s->msg_callback_arg);
|
|
|
ff4ef5 |
|
|
|
ff4ef5 |
s->init_num = 0;
|
|
|
ff4ef5 |
- return dtls1_get_message_fragment(s, st1, stn,
|
|
|
ff4ef5 |
- max, ok);
|
|
|
ff4ef5 |
+ goto redo;
|
|
|
ff4ef5 |
}
|
|
|
ff4ef5 |
else /* Incorrectly formated Hello request */
|
|
|
ff4ef5 |
{
|
|
|
ff4ef5 |
|