Changeset 368b574 in mod_gnutls for src

Timestamp:

Aug 18, 2010, 2:41:36 PM (12 years ago)

Author:

Nikos Mavrogiannopoulos <nmav@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream

Children:

41dd507

Parents:

7fec961

git-author:

Nikos Mavrogiannopoulos <nmav@…> (08/17/10 13:04:34)

git-committer:

Nikos Mavrogiannopoulos <nmav@…> (08/18/10 14:41:36)

Message:

Safer usage of session variable to prevent segmentation faults on closure. Should solve issue #106.

Location:

src

Files:

• gnutls_hooks.c (modified) (11 diffs)
• gnutls_io.c (modified) (7 diffs)

src/gnutls_hooks.c

@@ -487 +487 @@
 const char *mgs_hook_http_scheme(const request_rec * r)
 {
-    mgs_srvconf_rec *sc =
+    mgs_srvconf_rec *sc;
+    
+    if (r == NULL)
+        return NULL;
+    
+    sc =
         (mgs_srvconf_rec *) ap_get_module_config(r->server->module_config,
                                                  &gnutls_module);
@@ -501 +506 @@
 apr_port_t mgs_hook_default_port(const request_rec * r)
 {
-    mgs_srvconf_rec *sc =
+    mgs_srvconf_rec *sc;
+    
+    if (r == NULL)
+        return 0;
+    
+    sc =
         (mgs_srvconf_rec *) ap_get_module_config(r->server->module_config,
                                                  &gnutls_module);
@@ -580 +590 @@
 #endif
 
+    if (session == NULL)
+        return NULL;
+
     _gnutls_log(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     ctxt = gnutls_transport_get_ptr(session);
@@ -694 +707 @@
 {
     mgs_handle_t *ctxt;
-    mgs_srvconf_rec *sc =
+    mgs_srvconf_rec *sc;
+
+    _gnutls_log(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
+    
+    if (c == NULL)
+        return DECLINED;
+    
+    sc =
         (mgs_srvconf_rec *) ap_get_module_config(c->base_server->
                                                  module_config,
                                                  &gnutls_module);
 
-    _gnutls_log(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     if (!(sc && (sc->enabled == GNUTLS_ENABLED_TRUE))) {
         return DECLINED;
@@ -733 +752 @@
     int rv = OK;
 
+    if (r == NULL)
+        return DECLINED;
+
     _gnutls_log(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     apr_table_t *env = r->subprocess_env;
@@ -739 +761 @@
         ap_get_module_config(r->connection->conn_config, &gnutls_module);
 
-    if (!ctxt) {
+    if (!ctxt || ctxt->session == NULL) {
         return DECLINED;
     }
@@ -805 +827 @@
     int rv;
     mgs_handle_t *ctxt;
-    mgs_dirconf_rec *dc = ap_get_module_config(r->per_dir_config,
+    mgs_dirconf_rec *dc;
+    
+    if (r == NULL)
+        return DECLINED;
+    
+    dc = ap_get_module_config(r->per_dir_config,
                                                &gnutls_module);
 
@@ -812 +839 @@
         ap_get_module_config(r->connection->conn_config, &gnutls_module);
 
-    if (!ctxt) {
+    if (!ctxt || ctxt->session == NULL) {
         return DECLINED;
     }
@@ -875 +902 @@
     size_t len;
     int ret, i;
+
+    if (r == NULL)
+        return;
 
     apr_table_t *env = r->subprocess_env;
@@ -984 +1014 @@
     size_t len;
     int ret;
+    
+    if (r == NULL)
+        return;
 
     _gnutls_log(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
@@ -1052 +1085 @@
     } cert;
     apr_time_t expiration_time, cur_time;
+
+    if (r == NULL || ctxt == NULL || ctxt->session == NULL)
+        return HTTP_FORBIDDEN;
 
     _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__);

src/gnutls_io.c

@@ -222 +222 @@
         }
     }
+    
+    if (ctxt->session == NULL) {
+        return APR_EGENERAL;
+    }
 
     while (1) {
@@ -361 +365 @@
     int maxtries = HANDSHAKE_MAX_TRIES;
 
-    if (ctxt->status != 0) {
+    if (ctxt->status != 0 || ctxt->session == NULL) {
         return -1;
     }
@@ -442 +446 @@
 {
     int rv;
+    
+    if (ctxt->session == NULL)
+        return -1;
 
     rv = gnutls_rehandshake(ctxt->session);
@@ -566 +573 @@
             apr_bucket_copy(bucket, &e);
             APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e);
-            
+ 
             if ((status = ap_pass_brigade(f->next, tmpb)) != APR_SUCCESS) {
                 apr_brigade_cleanup(ctxt->output_bb);
@@ -610 +617 @@
             if (len > 0) {
 
-                do {
-                    ret = gnutls_record_send(ctxt->session, data, len);
-                }
-                while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
+                if (ctxt->session == NULL) {
+                    ret = GNUTLS_E_INVALID_REQUEST;
+                } else {
+                    do {
+                        ret = gnutls_record_send(ctxt->session, data, len);
+                    }
+                    while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
+                }
 
                 if (ret < 0) {
@@ -675 +686 @@
                 return 0;
             } else {
-                gnutls_transport_set_errno(ctxt->session, EINTR);
+                if (ctxt->session)
+                    gnutls_transport_set_errno(ctxt->session, EINTR);
                 return -1;
             }
@@ -698 +710 @@
         || APR_STATUS_IS_EINTR(ctxt->input_rc)) {
         if (len == 0) {
-            gnutls_transport_set_errno(ctxt->session, EINTR);
+            if (ctxt->session)
+                gnutls_transport_set_errno(ctxt->session, EINTR);
             return -1;
         }