From: miod <miod@openbsd.org>
Date: Sun, 18 May 2014 16:13:48 +0000 (+0000)
Subject: In dtls1_reassemble_fragment() and dtls1_process_out_of_seq_message(), in case
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=06f76ca70766285913f702c4abeb1c2ca4e061e8;p=openbsd

In dtls1_reassemble_fragment() and dtls1_process_out_of_seq_message(), in case
of error, make sure we do not free pitem which is still linked into the
pqueue.
In the same vain, only free `frag' if we allocated it in this function.

Help and ok beck@
---

diff --git a/lib/libssl/d1_both.c b/lib/libssl/d1_both.c
index db57bf9d3d5..10b62cd4104 100644
--- a/lib/libssl/d1_both.c
+++ b/lib/libssl/d1_both.c
@@ -618,7 +618,7 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 		frag->msg_header.frag_len = frag->msg_header.msg_len;
 		frag->msg_header.frag_off = 0;
 	} else
-		frag = (hm_fragment*) item->data;
+		frag = (hm_fragment*)item->data;
 
 	/* If message is already reassembled, this must be a
 	 * retransmit and can be dropped.
@@ -671,10 +671,8 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 	return DTLS1_HM_FRAGMENT_RETRY;
 
 err:
-	if (frag != NULL)
+	if (item == NULL && frag != NULL)
 		dtls1_hm_fragment_free(frag);
-	if (item != NULL)
-		free(item);
 	*ok = 0;
 	return i;
 }
@@ -755,10 +753,8 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 	return DTLS1_HM_FRAGMENT_RETRY;
 
 err:
-	if (frag != NULL)
+	if (item == NULL && frag != NULL)
 		dtls1_hm_fragment_free(frag);
-	if (item != NULL)
-		free(item);
 	*ok = 0;
 	return i;
 }
diff --git a/lib/libssl/src/ssl/d1_both.c b/lib/libssl/src/ssl/d1_both.c
index db57bf9d3d5..10b62cd4104 100644
--- a/lib/libssl/src/ssl/d1_both.c
+++ b/lib/libssl/src/ssl/d1_both.c
@@ -618,7 +618,7 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 		frag->msg_header.frag_len = frag->msg_header.msg_len;
 		frag->msg_header.frag_off = 0;
 	} else
-		frag = (hm_fragment*) item->data;
+		frag = (hm_fragment*)item->data;
 
 	/* If message is already reassembled, this must be a
 	 * retransmit and can be dropped.
@@ -671,10 +671,8 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 	return DTLS1_HM_FRAGMENT_RETRY;
 
 err:
-	if (frag != NULL)
+	if (item == NULL && frag != NULL)
 		dtls1_hm_fragment_free(frag);
-	if (item != NULL)
-		free(item);
 	*ok = 0;
 	return i;
 }
@@ -755,10 +753,8 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 	return DTLS1_HM_FRAGMENT_RETRY;
 
 err:
-	if (frag != NULL)
+	if (item == NULL && frag != NULL)
 		dtls1_hm_fragment_free(frag);
-	if (item != NULL)
-		free(item);
 	*ok = 0;
 	return i;
 }