Cleanup of setting external buffer
Don't use |BIO_set_foo_buffer_size| when setting the
sizes of the buffers while making buffer pair. Since it
happens in pair.c we know the BIOs are BIO pairs and using
bio_ctrl here complicates setting external buffers. Also
zero out bio_bio_st during construction.
This fixes a problem that would happen if the default buffer
sizes were not set, since buf_externally_allocated was
not yet initialized.
Remove BIO_C_SET_BUFF_SIZE and BIO_CTRL_RESET which are
not used for bio pairs.
Change-Id: I365091d5f44f6f1c5522c325a771bdf03d8fe950
Reviewed-on: https://boringssl-review.googlesource.com/2370
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/crypto/bio/pair.c b/crypto/bio/pair.c
index 14a0bab..fe6a275 100644
--- a/crypto/bio/pair.c
+++ b/crypto/bio/pair.c
@@ -91,11 +91,9 @@
if (b == NULL) {
return 0;
}
+ memset(b, 0, sizeof(struct bio_bio_st));
- b->peer = NULL;
b->size = 17 * 1024; /* enough for one TLS record (just a default) */
- b->buf = NULL;
-
bio->ptr = b;
return 1;
}
@@ -354,7 +352,6 @@
max_available = bio_zero_copy_get_write_buf(b, out_write_buf, out_buf_offset);
if (max_available > 0) {
- OPENSSL_PUT_ERROR(BIO, BIO_zero_copy_get_write_buf, BIO_R_INVALID_ARGUMENT);
b->zero_copy_write_lock = 1;
}
@@ -580,8 +577,9 @@
return num;
}
-static int bio_make_pair(BIO* bio1, BIO* bio2, uint8_t* ext_writebuf1,
- uint8_t* ext_writebuf2) {
+static int bio_make_pair(BIO* bio1, BIO* bio2,
+ size_t writebuf1_len, uint8_t* ext_writebuf1,
+ size_t writebuf2_len, uint8_t* ext_writebuf2) {
struct bio_bio_st *b1, *b2;
assert(bio1 != NULL);
@@ -595,7 +593,13 @@
return 0;
}
+ assert(b1->buf_externally_allocated == 0);
+ assert(b2->buf_externally_allocated == 0);
+
if (b1->buf == NULL) {
+ if (writebuf1_len) {
+ b1->size = writebuf1_len;
+ }
if (!ext_writebuf1) {
b1->buf_externally_allocated = 0;
b1->buf = OPENSSL_malloc(b1->size);
@@ -612,6 +616,9 @@
}
if (b2->buf == NULL) {
+ if (writebuf2_len) {
+ b2->size = writebuf2_len;
+ }
if (!ext_writebuf2) {
b2->buf_externally_allocated = 0;
b2->buf = OPENSSL_malloc(b2->size);
@@ -653,32 +660,6 @@
switch (cmd) {
/* specific CTRL codes */
- case BIO_C_SET_BUFF_SIZE:
- if (b->peer) {
- OPENSSL_PUT_ERROR(BIO, bio_ctrl, BIO_R_IN_USE);
- ret = 0;
- } else if (num == 0) {
- OPENSSL_PUT_ERROR(BIO, bio_ctrl, BIO_R_INVALID_ARGUMENT);
- ret = 0;
- } else {
- size_t new_size = num;
-
- /* Don't change the size of externally allocated buffers. */
- if (b->buf && !b->buf_externally_allocated) {
- return 0;
- }
-
- if (b->size != new_size) {
- if (b->buf) {
- OPENSSL_free(b->buf);
- b->buf = NULL;
- }
- b->size = new_size;
- }
- ret = 1;
- }
- break;
-
case BIO_C_GET_WRITE_BUF_SIZE:
ret = (long)b->size;
break;
@@ -717,14 +698,6 @@
/* standard CTRL codes follow */
- case BIO_CTRL_RESET:
- if (b->buf != NULL) {
- b->len = 0;
- b->offset = 0;
- }
- ret = 0;
- break;
-
case BIO_CTRL_GET_CLOSE:
ret = bio->shutdown;
break;
@@ -776,48 +749,43 @@
return bio_write(bio, str, strlen(str));
}
+static const BIO_METHOD methods_biop = {
+ BIO_TYPE_BIO, "BIO pair", bio_write, bio_read,
+ bio_puts, NULL /* no bio_gets */, bio_ctrl, bio_new,
+ bio_free, NULL /* no bio_callback_ctrl */
+};
+
+const BIO_METHOD *bio_s_bio(void) { return &methods_biop; }
+
int BIO_new_bio_pair(BIO** bio1_p, size_t writebuf1,
BIO** bio2_p, size_t writebuf2) {
return BIO_new_bio_pair_external_buf(bio1_p, writebuf1, NULL, bio2_p,
writebuf2, NULL);
}
-int BIO_new_bio_pair_external_buf(BIO** bio1_p, size_t writebuf1,
+int BIO_new_bio_pair_external_buf(BIO** bio1_p, size_t writebuf1_len,
uint8_t* ext_writebuf1,
- BIO** bio2_p, size_t writebuf2,
+ BIO** bio2_p, size_t writebuf2_len,
uint8_t* ext_writebuf2) {
BIO *bio1 = NULL, *bio2 = NULL;
- long r;
int ret = 0;
/* External buffers must have sizes greater than 0. */
- if ((ext_writebuf1 && !writebuf1) || (ext_writebuf2 && !writebuf2)) {
- return 0;
+ if ((ext_writebuf1 && !writebuf1_len) || (ext_writebuf2 && !writebuf2_len)) {
+ goto err;
}
- bio1 = BIO_new(BIO_s_bio());
+ bio1 = BIO_new(bio_s_bio());
if (bio1 == NULL) {
goto err;
}
- bio2 = BIO_new(BIO_s_bio());
+ bio2 = BIO_new(bio_s_bio());
if (bio2 == NULL) {
goto err;
}
- if (writebuf1) {
- r = BIO_set_write_buffer_size(bio1, writebuf1);
- if (!r) {
- goto err;
- }
- }
- if (writebuf2) {
- r = BIO_set_write_buffer_size(bio2, writebuf2);
- if (!r) {
- goto err;
- }
- }
-
- if (!bio_make_pair(bio1, bio2, ext_writebuf1, ext_writebuf2)) {
+ if (!bio_make_pair(bio1, bio2, writebuf1_len, ext_writebuf1, writebuf2_len,
+ ext_writebuf2)) {
goto err;
}
ret = 1;
@@ -839,14 +807,6 @@
return ret;
}
-static const BIO_METHOD methods_biop = {
- BIO_TYPE_BIO, "BIO pair", bio_write, bio_read,
- bio_puts, NULL /* no bio_gets */, bio_ctrl, bio_new,
- bio_free, NULL /* no bio_callback_ctrl */
-};
-
-const BIO_METHOD *BIO_s_bio(void) { return &methods_biop; }
-
size_t BIO_ctrl_get_read_request(BIO *bio) {
return BIO_ctrl(bio, BIO_C_GET_READ_REQUEST, 0, NULL);
}
diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 3f64dd3..4d89d11 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -588,19 +588,16 @@
/* BIO_new_bio_pair_external_buf is the same as |BIO_new_bio_pair| with the
* difference that the caller keeps ownership of the write buffers
- * |ext_writebuf1| and |ext_writebuf2|. This is useful when using zero copy API
- * for read and write operations, in cases where the buffers need to outlive the
- * BIO pairs. It returns one on success and zero on error. */
+ * |ext_writebuf1_len| and |ext_writebuf2_len|. This is useful when using zero
+ * copy API for read and write operations, in cases where the buffers need to
+ * outlive the BIO pairs. It returns one on success and zero on error. */
OPENSSL_EXPORT int BIO_new_bio_pair_external_buf(BIO** bio1_p,
- size_t writebuf1,
+ size_t writebuf1_len,
uint8_t* ext_writebuf1,
BIO** bio2_p,
- size_t writebuf2,
+ size_t writebuf2_len,
uint8_t* ext_writebuf2);
-/* BIO_s_bio returns the method for a BIO pair. */
-OPENSSL_EXPORT const BIO_METHOD *BIO_s_bio(void);
-
/* BIO_ctrl_get_read_request returns the number of bytes that the other side of
* |bio| tried (unsuccessfully) to read. */
OPENSSL_EXPORT size_t BIO_ctrl_get_read_request(BIO *bio);
