Changeset a9fa300 in mod_gnutls

Timestamp:

May 27, 2016, 12:11:32 PM (3 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

19f2719

Parents:

6868585

Message:

Set GnuTLS session errno on all error paths in mgs_transport_read()

File:

• src/gnutls_io.c (modified) (4 diffs)

src/gnutls_io.c

@@ -765 +765 @@
 /**
  * Pull function for GnuTLS
+ *
+ * Generic errnos used for gnutls_transport_set_errno:
+ * EIO: Unknown I/O error
+ * ECONNABORTED: Input BB does not exist (NULL)
+ *
+ * The reason we are not using APR_TO_OS_ERROR to map apr_status_t to
+ * errnos is this warning in the APR documentation: "If the statcode
+ * was not created by apr_get_os_error or APR_FROM_OS_ERROR, the
+ * results are undefined." We cannot know if this applies to any error
+ * we might encounter.
  */
 ssize_t mgs_transport_read(gnutls_transport_ptr_t ptr,
@@ -782 +792 @@
     if (!ctxt->input_bb) {
         ctxt->input_rc = APR_EOF;
+        gnutls_transport_set_errno(ctxt->session, ECONNABORTED);
         return -1;
     }
@@ -813 +824 @@
             apr_brigade_cleanup(ctxt->input_bb);
             ctxt->input_bb = NULL;
+            gnutls_transport_set_errno(ctxt->session, EIO);
             return -1;
         }
@@ -850 +862 @@
     }
 
+    gnutls_transport_set_errno(ctxt->session, EIO);
     return -1;
 }
 
+/**
+ * Push function for GnuTLS
+ *
+ * In case of unexpected errors gnutls_transport_set_errno is called
+ * with EIO.  The reason we are not using APR_TO_OS_ERROR to map
+ * apr_status_t to errnos is this warning in the APR documentation:
+ * "If the statcode was not created by apr_get_os_error or
+ * APR_FROM_OS_ERROR, the results are undefined." We cannot know if
+ * this applies to any error we might encounter.
+ */
 ssize_t mgs_transport_write(gnutls_transport_ptr_t ptr,
         const void *buffer, size_t len) {