Bug 1313123 - Merge UBSan runs back with ASan and fix remaining test …

…suites r=franziskus

Differential Revision: https://nss-dev.phacility.com/D125

--HG--
extra : amend_source : 5e9395472515cccd88316bbcf065f867a8d673e6

automation/taskcluster/graph/src/extend.js

@@ -14,14 +14,10 @@ const WINDOWS_CHECKOUT_CMD =
 
 /*****************************************************************************/
 
-function isSanitizer(task) {
-  return task.collection == "asan" || task.collection == "ubsan";
-}
-
 queue.filter(task => {
   if (task.group == "Builds") {
     // Remove extra builds on {A,UB}San and ARM.
-    if (isSanitizer(task) || task.collection == "arm-debug") {
+    if (task.collection == "asan" || task.collection == "arm-debug") {
       return false;
     }
 
@@ -44,17 +40,11 @@ queue.filter(task => {
     }
   }
 
-  // Filter test suites that currently fail with UBSan.
-  if (task.collection == "ubsan" &&
-      ["crmf", "cipher", "fips", "merge", "smime"].includes(task.tests)) {
-    return false;
-  }
-
   return true;
 });
 
 queue.map(task => {
-  if (isSanitizer(task)) {
+  if (task.collection == "asan") {
     // CRMF and FIPS tests still leak, unfortunately.
     if (task.tests == "crmf" || task.tests == "fips") {
       task.env.ASAN_OPTIONS = "detect_leaks=0";
@@ -121,20 +111,6 @@ export default async function main() {
   });
 
   await scheduleLinux("Linux 64 (ASan, debug)", {
-    env: {
-      NSS_DISABLE_ARENA_FREE_LIST: "1",
-      NSS_DISABLE_UNLOAD: "1",
-      CC: "clang",
-      CCC: "clang++",
-      USE_ASAN: "1",
-      USE_64: "1"
-    },
-    platform: "linux64",
-    collection: "asan",
-    image: LINUX_IMAGE
-  });
-
-  await scheduleLinux("Linux 64 (ASan+UBSan, debug)", {
     env: {
       UBSAN_OPTIONS: "print_stacktrace=1",
       NSS_DISABLE_ARENA_FREE_LIST: "1",
@@ -146,7 +122,7 @@ export default async function main() {
       USE_64: "1"
     },
     platform: "linux64",
-    collection: "ubsan",
+    collection: "asan",
     image: LINUX_IMAGE
   });
 

automation/taskcluster/graph/src/try_syntax.js

@@ -113,7 +113,7 @@ function filter(opts) {
 
       // Additional checks.
       if (platform == "linux64-asan") {
-        keep &= coll("asan") || coll("ubsan");
+        keep &= coll("asan");
       } else if (platform == "arm") {
         keep &= coll("arm-opt") || coll("arm-debug");
       } else if (platform == "linux64-gyp") {
@@ -132,8 +132,8 @@ function filter(opts) {
     }
 
     // Finally, filter by build type.
-    let isDebug = coll("debug") || coll("asan") || coll("ubsan") ||
-                  coll("arm-debug") || coll("gyp") || coll("fuzz");
+    let isDebug = coll("debug") || coll("asan") || coll("arm-debug") ||
+                  coll("gyp") || coll("fuzz");
     return (isDebug && opts.builds.includes("d")) ||
            (!isDebug && opts.builds.includes("o"));
   }

lib/crmf/crmfpop.c

@@ -125,7 +125,9 @@ crmf_generic_encoder_callback(void *arg, const char *buf, unsigned long len,
         encoderArg->allocatedLen = newSize;
     }
     cursor = &(encoderArg->buffer->data[encoderArg->buffer->len]);
-    PORT_Memcpy(cursor, buf, len);
+    if (len) {
+        PORT_Memcpy(cursor, buf, len);
+    }
     encoderArg->buffer->len += len;
 }
 

lib/freebl/alg2268.c

@@ -364,7 +364,7 @@ rc2_Decrypt1Block(RC2Context *cx, RC2Block *output, RC2Block *input)
     output->s[3] = R3;
 }
 
-static SECStatus
+static SECStatus NO_SANITIZE_ALIGNMENT
 rc2_EncryptECB(RC2Context *cx, unsigned char *output,
                const unsigned char *input, unsigned int inputLen)
 {
@@ -381,7 +381,7 @@ rc2_EncryptECB(RC2Context *cx, unsigned char *output,
     return SECSuccess;
 }
 
-static SECStatus
+static SECStatus NO_SANITIZE_ALIGNMENT
 rc2_DecryptECB(RC2Context *cx, unsigned char *output,
                const unsigned char *input, unsigned int inputLen)
 {
@@ -398,7 +398,7 @@ rc2_DecryptECB(RC2Context *cx, unsigned char *output,
     return SECSuccess;
 }
 
-static SECStatus
+static SECStatus NO_SANITIZE_ALIGNMENT
 rc2_EncryptCBC(RC2Context *cx, unsigned char *output,
                const unsigned char *input, unsigned int inputLen)
 {

lib/freebl/camellia.c

@@ -1078,7 +1078,7 @@ camellia_setup192(const unsigned char *key, PRUint32 *subkey)
  * Stuff related to camellia encryption/decryption
  *
  */
-SECStatus
+SECStatus NO_SANITIZE_ALIGNMENT
 camellia_encrypt128(const PRUint32 *subkey,
                     unsigned char *output,
                     const unsigned char *input)
@@ -1185,7 +1185,7 @@ camellia_encrypt128(const PRUint32 *subkey,
     return SECSuccess;
 }
 
-SECStatus
+SECStatus NO_SANITIZE_ALIGNMENT
 camellia_decrypt128(const PRUint32 *subkey,
                     unsigned char *output,
                     const unsigned char *input)
@@ -1295,7 +1295,7 @@ camellia_decrypt128(const PRUint32 *subkey,
 /**
  * stuff for 192 and 256bit encryption/decryption
  */
-SECStatus
+SECStatus NO_SANITIZE_ALIGNMENT
 camellia_encrypt256(const PRUint32 *subkey,
                     unsigned char *output,
                     const unsigned char *input)
@@ -1426,7 +1426,7 @@ camellia_encrypt256(const PRUint32 *subkey,
     return SECSuccess;
 }
 
-SECStatus
+SECStatus NO_SANITIZE_ALIGNMENT
 camellia_decrypt256(const PRUint32 *subkey,
                     unsigned char *output,
                     const unsigned char *input)

lib/freebl/sha_fast.c

@@ -140,7 +140,7 @@ SHA1_Update(SHA1Context *ctx, const unsigned char *dataIn, unsigned int len)
 /*
  *  SHA: Generate hash value from context
  */
-void
+void NO_SANITIZE_ALIGNMENT
 SHA1_End(SHA1Context *ctx, unsigned char *hashout,
          unsigned int *pDigestLen, unsigned int maxDigestLen)
 {

lib/smime/cmsencode.c

@@ -105,7 +105,9 @@ nss_cms_encoder_out(void *arg, const char *buf, unsigned long len,
 	output->dest->len += len;
 
 	/* copy it in */
-	PORT_Memcpy(output->dest->data + offset, buf, len);
+        if (len) {
+            PORT_Memcpy(output->dest->data + offset, buf, len);
+        }
     }
 }
 

lib/softoken/legacydb/lgutil.c

@@ -67,7 +67,9 @@ lg_Attribute2SecItem(PLArenaPool *arena, CK_ATTRIBUTE_TYPE type,
         return CKR_HOST_MEMORY;
     }
     item->len = len;
-    PORT_Memcpy(item->data, attribute->pValue, len);
+    if (item->len) {
+        PORT_Memcpy(item->data, attribute->pValue, len);
+    }
     return CKR_OK;
 }
 

lib/softoken/pkcs11.c

@@ -4006,7 +4006,9 @@ NSC_Login(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType,
         return CKR_PIN_LEN_RANGE;
 
     /* convert to null terminated string */
-    PORT_Memcpy(pinStr, pPin, ulPinLen);
+    if (ulPinLen) {
+        PORT_Memcpy(pinStr, pPin, ulPinLen);
+    }
     pinStr[ulPinLen] = 0;
 
     handle = sftk_getKeyDB(slot);