Commit b74d1d26 authored by Adam Langley's avatar Adam Langley Committed by Matt Caswell
Browse files

Fix return code for truncated DTLS fragment. 



Previously, a truncated DTLS fragment in
|dtls1_process_out_of_seq_message| would cause *ok to be cleared, but
the return value would still be the number of bytes read. This would
cause |dtls1_get_message| not to consider it an error and it would
continue processing as normal until the calling function noticed that
*ok was zero.

I can't see an exploit here because |dtls1_get_message| uses
|s->init_num| as the length, which will always be zero from what I can
see.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
parent d0a4b7d1

ssl/d1_both.c

+3 −1
Original line number Diff line number Diff line
@@ -776,7 +776,9 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok) 
			/* read the body of the fragment (header has already been read */

			i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,

				frag->fragment,frag_len,0);

			if (i<=0 || (unsigned long)i!=frag_len)

			if ((unsigned long)i!=frag_len)

				i = -1;

			if (i<=0)

				goto err;

			}