svn commit: r1540161 - in /httpd/httpd/trunk: include/ap_slotmem.h modules/slotmem/mod_slotmem_shm.c

[ji...@apache.org]

Author: jim
Date: Fri Nov  8 19:38:20 2013
New Revision: 1540161

URL: http://svn.apache.org/r1540161
Log:
Error detection and a quick validity check when restoring...
Designed to address errors, not nefarious changes.

Modified:
    httpd/httpd/trunk/include/ap_slotmem.h
    httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c

Modified: httpd/httpd/trunk/include/ap_slotmem.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_slotmem.h?rev=1540161&r1=1540160&r2=1540161&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_slotmem.h (original)
+++ httpd/httpd/trunk/include/ap_slotmem.h Fri Nov  8 19:38:20 2013
@@ -39,6 +39,7 @@
 #include "apr_shm.h"
 #include "apr_global_mutex.h"
 #include "apr_file_io.h"
+#include "apr_md5.h"
 
 #if APR_HAVE_UNISTD_H
 #include <unistd.h>         /* for getpid() */

Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1540161&r1=1540160&r2=1540161&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Fri Nov  8 19:38:20 2013
@@ -178,6 +178,8 @@ static void store_slotmem(ap_slotmem_ins
     apr_status_t rv;
     apr_size_t nbytes;
     const char *storename;
+    char digest[APR_MD5_DIGESTSIZE];
+    apr_size_t written = 0;
 
     storename = slotmem_filename(slotmem->gpool, slotmem->name, 1);
 
@@ -200,20 +202,28 @@ static void store_slotmem(ap_slotmem_ins
         }
         nbytes = (slotmem->desc.size * slotmem->desc.num) +
                  (slotmem->desc.num * sizeof(char)) + AP_UNSIGNEDINT_OFFSET;
-        /* XXX: Error handling */
-        apr_file_write_full(fp, slotmem->persist, nbytes, NULL);
+        apr_md5((unsigned char*)digest, slotmem->persist, nbytes);
+        rv = apr_file_write_full(fp, slotmem->persist, nbytes, &written);
+        if (rv == APR_SUCCESS && written == nbytes) {
+            rv = apr_file_write_full(fp, digest, APR_MD5_DIGESTSIZE, &written);
+        }
         apr_file_close(fp);
+        if (rv != APR_SUCCESS || written != APR_MD5_DIGESTSIZE) {
+            apr_file_remove(storename, slotmem->gpool);
+        }
     }
 }
 
-/* should be apr_status_t really */
-static void restore_slotmem(void *ptr, const char *name, apr_size_t size,
-                            apr_pool_t *pool)
+static apr_status_t restore_slotmem(void *ptr, const char *name, apr_size_t size,
+                                    apr_pool_t *pool)
 {
     const char *storename;
     apr_file_t *fp;
     apr_size_t nbytes = size;
-    apr_status_t rv;
+    apr_status_t rv = APR_SUCCESS;
+    char digest[APR_MD5_DIGESTSIZE];
+    char digest2[APR_MD5_DIGESTSIZE];
+
 
     storename = slotmem_filename(pool, name, 1);
 
@@ -224,20 +234,20 @@ static void restore_slotmem(void *ptr, c
         rv = apr_file_open(&fp, storename, APR_READ | APR_WRITE, APR_OS_DEFAULT,
                            pool);
         if (rv == APR_SUCCESS) {
-            apr_finfo_t fi;
-            if (apr_file_info_get(&fi, APR_FINFO_SIZE, fp) == APR_SUCCESS) {
-                if (fi.size == nbytes) {
-                    apr_file_read(fp, ptr, &nbytes);
-                }
-                else {
-                    apr_file_close(fp);
-                    apr_file_remove(storename, pool);
-                    return;
+            rv = apr_file_read(fp, ptr, &nbytes);
+            if (rv == APR_SUCCESS) {
+                rv = apr_file_gets(digest, APR_MD5_DIGESTSIZE, fp);
+                if (rv == APR_SUCCESS) {
+                    apr_md5((unsigned char*)digest2, ptr, nbytes);
+                    if (!strcasecmp(digest, digest2)) {
+                        rv = APR_EGENERAL;
+                    }
                 }
             }
             apr_file_close(fp);
         }
     }
+    return rv;
 }
 
 static apr_status_t cleanup_slotmem(void *param)
@@ -395,8 +405,14 @@ static apr_status_t slotmem_create(ap_sl
          * sense if the restore fails? Any?
          */
         if (type & AP_SLOTMEM_TYPE_PERSIST) {
-            restore_slotmem(ptr, fname, dsize, pool);
-            restored = 1;
+            rv = restore_slotmem(ptr, fname, dsize, pool);
+            if (rv == APR_SUCCESS) {
+                restored = 1;
+            }
+            else {
+                /* just in case, re-zero */
+                memset(ptr, 0, dsize);
+            }
         }
     }