Taint: fix hybrid-mode transition

diff --git a/src/src/store.c b/src/src/store.c
index 1fe97e6c9897f0ef7116561da1d483cb3e39fa2f..3192b9774f35e3c30e168be9b8724c39a4849eb8 100644 (file)
--- a/src/src/store.c
+++ b/src/src/store.c
@@ -225,14 +225,20 @@ log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Taint mismatch, %s: %s %d\n",
 }
 
 static void
 }
 
 static void

-use_slow_taint_check(void)
+use_slow_taint_check(const uschar * why)

 {
 #ifndef COMPILE_UTILITY
 {
 #ifndef COMPILE_UTILITY

-DEBUG(D_any) debug_printf("switching to slow-mode taint checking\n");
+DEBUG(D_any)
+  debug_printf("switching to slow-mode taint checking (after %s) "
+             "taint bounds %p %p\n", why, tainted_base, tainted_top);

 #endif
 f.taint_check_slow = TRUE;
 }
 
 #endif
 f.taint_check_slow = TRUE;
 }
 

+/* If the creation of a new tainted region results in any of the
+untainted regions appearing to be tainted, using the fast-mode test,
+we need to switch to safe-but-slow mode. */
+

 static void
 verify_all_untainted(void)
 {
 static void
 verify_all_untainted(void)
 {


@@ -242,7 +248,7 @@ for (int pool = 0; pool < POOL_TAINT_BASE; pool++)
     uschar * bc = US b + ALIGNED_SIZEOF_STOREBLOCK;
     if (is_tainted(bc))
       {
     uschar * bc = US b + ALIGNED_SIZEOF_STOREBLOCK;
     if (is_tainted(bc))
       {

-      use_slow_taint_check();
+      use_slow_taint_check(US"mmap");

       return;
       }
     }
       return;
       }
     }


@@ -841,7 +847,7 @@ if (!(yield = mmap(NULL, (size_t)size,
 
 if (yield < tainted_base) tainted_base = yield;
 if ((top = US yield + size) > tainted_top) tainted_top = top;
 
 if (yield < tainted_base) tainted_base = yield;
 if ((top = US yield + size) > tainted_top) tainted_top = top;

-if (!f.taint_check_slow) use_slow_taint_check();
+if (!f.taint_check_slow) verify_all_untainted();

 
 return store_alloc_tail(yield, size, func, line, US"Mmap");
 }
 
 return store_alloc_tail(yield, size, func, line, US"Mmap");
 }


@@ -879,7 +885,7 @@ the slower checking for tainting (checking an address against all
 the tainted pool block spans, rather than just the mmap span) */
 
 if (!f.taint_check_slow && is_tainted(yield))
 the tainted pool block spans, rather than just the mmap span) */
 
 if (!f.taint_check_slow && is_tainted(yield))

-  use_slow_taint_check();
+  use_slow_taint_check(US"malloc");

 
 return store_alloc_tail(yield, size, func, linenumber, US"Malloc");
 }
 
 return store_alloc_tail(yield, size, func, linenumber, US"Malloc");
 }

diff --git a/test/confs/0599 b/test/confs/0599
index 54667124d8f5cdb0e3541796bdc227c2e64844bc..efdbd3c60be9099046dcf83f06ca97d6782cbfb7 100644 (file)
--- a/test/confs/0599
+++ b/test/confs/0599
@@ -50,5 +50,6 @@ smtp:
   hosts =      HOSTIPV4
   port =       PORT_D
   allow_localhost
   hosts =      HOSTIPV4
   port =       PORT_D
   allow_localhost

+  hosts_try_fastopen = :

 
 # End
 
 # End

diff --git a/test/runtest b/test/runtest
index 595566e409a7b43fdb94512103b09df99ebd342e..d9db2ccc8be3a3aca5be49e29fcf7497c83265ee 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1325,6 +1325,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/^errno = \d+$/errno = EEE/;
     s/^writing error \d+: /writing error EEE: /;
 
     s/^errno = \d+$/errno = EEE/;
     s/^writing error \d+: /writing error EEE: /;
 

+    # Some platforms have to flip to slow-mode taint-checking
+    next if /switching to slow-mode taint checking/;
+

     # When Exim is checking the size of directories for maildir, it uses
     # the check_dir_size() function to scan directories. Of course, the order
     # of the files that are obtained using readdir() varies from system to
     # When Exim is checking the size of directories for maildir, it uses
     # the check_dir_size() function to scan directories. Of course, the order
     # of the files that are obtained using readdir() varies from system to