Commit 2521fcd8 authored by Michael Tuexen's avatar Michael Tuexen Committed by Dr. Stephen Henson
Browse files

Fix incorrect OPENSSL_assert() usage. 



Return an error code for I/O errors instead of an assertion failure.

PR#3470
Reviewed-by: default avatarStephen Henson <steve@openssl.org>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent e03b2987

crypto/bio/bss_dgram.c

+64 −22
Original line number Diff line number Diff line
@@ -975,10 +975,18 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag) 
	/* Activate SCTP-AUTH for DATA and FORWARD-TSN chunks */

	auth.sauth_chunk = OPENSSL_SCTP_DATA_CHUNK_TYPE;

	ret = setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_CHUNK, &auth, sizeof(struct sctp_authchunk));

	OPENSSL_assert(ret >= 0);

	if (ret < 0)

		{

		BIO_vfree(bio);

		return(NULL);

		}

	auth.sauth_chunk = OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE;

	ret = setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_CHUNK, &auth, sizeof(struct sctp_authchunk));

	OPENSSL_assert(ret >= 0);

	if (ret < 0)

		{

		BIO_vfree(bio);

		return(NULL);

		}



	/* Test if activation was successful. When using accept(),

	 * SCTP-AUTH has to be activated for the listening socket
@@ -987,7 +995,13 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag) 
	authchunks = OPENSSL_malloc(sockopt_len);

	memset(authchunks, 0, sockopt_len);

	ret = getsockopt(fd, IPPROTO_SCTP, SCTP_LOCAL_AUTH_CHUNKS, authchunks, &sockopt_len);

	OPENSSL_assert(ret >= 0);



	if (ret < 0)

		{

		OPENSSL_free(authchunks);

		BIO_vfree(bio);

		return(NULL);

		}



	for (p = (unsigned char*) authchunks->gauth_chunks;

	     p < (unsigned char*) authchunks + sockopt_len;
@@ -1009,16 +1023,28 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag) 
	event.se_type = SCTP_AUTHENTICATION_EVENT;

	event.se_on = 1;

	ret = setsockopt(fd, IPPROTO_SCTP, SCTP_EVENT, &event, sizeof(struct sctp_event));

	OPENSSL_assert(ret >= 0);

	if (ret < 0)

		{

		BIO_vfree(bio);

		return(NULL);

		}

#else

	sockopt_len = (socklen_t) sizeof(struct sctp_event_subscribe);

	ret = getsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &event, &sockopt_len);

	OPENSSL_assert(ret >= 0);

	if (ret < 0)

		{

		BIO_vfree(bio);

		return(NULL);

		}



	event.sctp_authentication_event = 1;



	ret = setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &event, sizeof(struct sctp_event_subscribe));

	OPENSSL_assert(ret >= 0);

	if (ret < 0)

		{

		BIO_vfree(bio);

		return(NULL);

		}

#endif

#endif
@@ -1026,7 +1052,11 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag) 
	 * larger than the max record size of 2^14 + 2048 + 13

	 */

	ret = setsockopt(fd, IPPROTO_SCTP, SCTP_PARTIAL_DELIVERY_POINT, &optval, sizeof(optval));

	OPENSSL_assert(ret >= 0);

	if (ret < 0)

		{

		BIO_vfree(bio);

		return(NULL);

		}



	return(bio);

	}
@@ -1191,16 +1221,28 @@ static int dgram_sctp_read(BIO *b, char *out, int outl) 
					event.se_type = SCTP_SENDER_DRY_EVENT;

					event.se_on = 0;

					i = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENT, &event, sizeof(struct sctp_event));

					OPENSSL_assert(i >= 0);

					if (i < 0)

						{

						ret = i;

						break;

						}

#else

					eventsize = sizeof(struct sctp_event_subscribe);

					i = getsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event, &eventsize);

					OPENSSL_assert(i >= 0);

					if (i < 0)

						{

						ret = i;

						break;

						}



					event.sctp_sender_dry_event = 0;



					i = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event, sizeof(struct sctp_event_subscribe));

					OPENSSL_assert(i >= 0);

					if (i < 0)

						{

						ret = i;

						break;

						}

#endif

					}
@@ -1233,7 +1275,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl) 
			 */

			optlen = (socklen_t) sizeof(int);

			ret = getsockopt(b->num, SOL_SOCKET, SO_RCVBUF, &optval, &optlen);

			OPENSSL_assert(ret >= 0);

			if (ret >= 0)

				OPENSSL_assert(optval >= 18445);



			/* Test if SCTP doesn't partially deliver below
@@ -1242,7 +1284,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl) 
			optlen = (socklen_t) sizeof(int);

			ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_PARTIAL_DELIVERY_POINT,

			                 &optval, &optlen);

			OPENSSL_assert(ret >= 0);

			if (ret >= 0)

				OPENSSL_assert(optval >= 18445);



			/* Partially delivered notification??? Probably a bug.... */
@@ -1277,8 +1319,8 @@ static int dgram_sctp_read(BIO *b, char *out, int outl) 
			authchunks = OPENSSL_malloc(optlen);

			memset(authchunks, 0, optlen);

			ii = getsockopt(b->num, IPPROTO_SCTP, SCTP_PEER_AUTH_CHUNKS, authchunks, &optlen);

			OPENSSL_assert(ii >= 0);



			if (ii >= 0)

				for (p = (unsigned char*) authchunks->gauth_chunks;

				     p < (unsigned char*) authchunks + optlen;

				     p += sizeof(uint8_t))