Move sanitizers to AL2022 and update to Clang 14

CMakeLists.txt

@@ -707,8 +707,8 @@ if(USE_CUSTOM_LIBCXX)
     message(FATAL_ERROR "USE_CUSTOM_LIBCXX only supported with Clang")
   endif()
 
-  # The docker images set an environement variable to the llvm project directory which the sandbox builds will use,
-  # you can also pass in the llvm project path as a CMake parameter which takes precedance over the environment variable
+  # The docker images set an environment variable to the llvm project directory which the sandbox builds will use,
+  # you can also pass in the llvm project path as a CMake parameter which takes precedence over the environment variable
   if(DEFINED ENV{LLVM_PROJECT_HOME} AND NOT LLVM_PROJECT_HOME)
     set(LLVM_PROJECT_HOME $ENV{LLVM_PROJECT_HOME})
   endif()
@@ -732,7 +732,7 @@ if(USE_CUSTOM_LIBCXX)
   # This is patterned after buildtools/third_party/libc++/BUILD.gn and
   # buildtools/third_party/libc++abi/BUILD.gn in Chromium.
 
-  file(GLOB LIBCXX_SOURCES "${LLVM_PROJECT_HOME}/libcxx/src/*.cpp")
+  file(GLOB LIBCXX_SOURCES "${LLVM_PROJECT_HOME}/libcxx/src/*.cpp" "${LLVM_PROJECT_HOME}/libcxx/src/ryu/*.cpp")
   file(GLOB LIBCXXABI_SOURCES "${LLVM_PROJECT_HOME}/libcxxabi/src/*.cpp")
 
   # This file is meant for exception-less builds.
@@ -751,9 +751,6 @@ if(USE_CUSTOM_LIBCXX)
     libcxxabi PRIVATE
     -D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS
   )
-  set_target_properties(libcxxabi PROPERTIES COMPILE_FLAGS "-Wno-missing-prototypes -Wno-implicit-fallthrough")
-  # libc++abi depends on libc++ internal headers.
-  set_property(TARGET libcxxabi APPEND PROPERTY INCLUDE_DIRECTORIES "${LLVM_PROJECT_HOME}/libcxx/src")
 
   add_library(libcxx ${LIBCXX_SOURCES})
   if(ASAN OR MSAN OR TSAN)
@@ -768,6 +765,15 @@ if(USE_CUSTOM_LIBCXX)
     -D_LIBCPP_BUILDING_LIBRARY
     -DLIBCXX_BUILDING_LIBCXXABI
   )
+  set_target_properties(
+    libcxx libcxxabi PROPERTIES
+    COMPILE_FLAGS "-Wno-missing-prototypes -Wno-implicit-fallthrough"
+    # libc++ and libc++abi must be built in C++20 mode.
+    CXX_STANDARD 20
+    CXX_STANDARD_REQUIRED TRUE
+  )
+  # libc++abi depends on libc++ internal headers.
+  set_property(TARGET libcxx libcxxabi APPEND PROPERTY INCLUDE_DIRECTORIES "${LLVM_PROJECT_HOME}/libcxx/src")
   target_link_libraries(libcxx libcxxabi)
 endif()
 

crypto/asn1/a_int.c

@@ -160,7 +160,14 @@ int i2c_ASN1_INTEGER(const ASN1_INTEGER *in, unsigned char **outp) {
   if (pad) {
     (*outp)[0] = 0;
   }
-  OPENSSL_memcpy(*outp + pad, in->data + start, in->length - start);
+  // If in->data is null the Undefined Behavior Sanitior flags this as applying
+  // an offset to a null pointer. Gracefully handle the case even though
+  // OPENSSL_memcpy handles the case when in->data is null and in->length is zero.
+  // Don't return early because an empty integer is still encoded as a single
+  // below byte.
+  if (in->data != NULL) {
+    OPENSSL_memcpy(*outp + pad, in->data + start, in->length - start);
+  }
   if (is_negative) {
     negate_twos_complement(*outp, len);
     assert((*outp)[0] >= 0x80);

crypto/blake2/blake2.c

@@ -105,6 +105,12 @@ void BLAKE2B256_Init(BLAKE2B_CTX *b2b) {
 }
 
 void BLAKE2B256_Update(BLAKE2B_CTX *b2b, const void *in_data, size_t len) {
+  // A length of zero is a valid input, however there is no work to be done and
+  // the logic below attempts to apply a zero offset to the potentially null
+  // pointer in_data which is undefined behavior.
+  if (len == 0) {
+    return;
+  }
   const uint8_t *data = (const uint8_t *)in_data;
 
   size_t todo = sizeof(b2b->block.bytes) - b2b->block_used;

tests/ci/cdk/cdk/codebuild/github_ci_linux_arm_omnibus.yaml

@@ -90,64 +90,6 @@ batch:
         compute-type: BUILD_GENERAL1_LARGE
         image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:ubuntu-20.04_clang-9x_latest
 
-    - identifier: ubuntu2004_clang9x_aarch_sanitizer
-      buildspec: ./tests/ci/codebuild/linux-aarch/run_sanitizer_tests.yml
-      env:
-        type: ARM_CONTAINER
-        privileged-mode: true
-        compute-type: BUILD_GENERAL1_LARGE
-        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:ubuntu-20.04_clang-9x_sanitizer_latest
-
-    # BoringSSL has 7k+ ssl runner tests, and the total number of the runner tests keep increasing.
-    # When ASAN enabled, the tests take more than 1 hour to finish. The cause relates to https://github.com/google/sanitizers/issues/1331
-    # To reduce the total time, these tests will be executed in below CodeBuild dimensions:
-    #   1. ubuntu2004_clang9x_ssl_asan_1
-    #   2. ubuntu2004_clang9x_ssl_asan_2
-    #   3. ubuntu2004_clang9x_ssl_asan_3
-    #   4. ubuntu2004_clang9x_ssl_asan_4
-    # Env var |AWS_LC_SSL_RUNNER_START_INDEX| and |AWS_LC_SSL_RUNNER_END_INDEX| are used to filter the runner tests.
-    - identifier: ubuntu2004_clang9x_ssl_asan_1
-      buildspec: ./tests/ci/codebuild/linux-aarch/run_ssl_asan_tests.yml
-      env:
-        type: ARM_CONTAINER
-        privileged-mode: true
-        compute-type: BUILD_GENERAL1_LARGE
-        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:ubuntu-20.04_clang-9x_latest
-        variables:
-          AWS_LC_SSL_RUNNER_END_INDEX: 3500
-
-    - identifier: ubuntu2004_clang9x_ssl_asan_2
-      buildspec: ./tests/ci/codebuild/linux-aarch/run_ssl_asan_tests.yml
-      env:
-        type: ARM_CONTAINER
-        privileged-mode: true
-        compute-type: BUILD_GENERAL1_LARGE
-        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:ubuntu-20.04_clang-9x_latest
-        variables:
-          AWS_LC_SSL_RUNNER_START_INDEX: 3501
-          AWS_LC_SSL_RUNNER_END_INDEX: 5500
-
-    - identifier: ubuntu2004_clang9x_ssl_asan_3
-      buildspec: ./tests/ci/codebuild/linux-aarch/run_ssl_asan_tests.yml
-      env:
-        type: ARM_CONTAINER
-        privileged-mode: true
-        compute-type: BUILD_GENERAL1_LARGE
-        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:ubuntu-20.04_clang-9x_latest
-        variables:
-          AWS_LC_SSL_RUNNER_START_INDEX: 5501
-          AWS_LC_SSL_RUNNER_END_INDEX: 7000
-
-    - identifier: ubuntu2004_clang9x_ssl_asan_4
-      buildspec: ./tests/ci/codebuild/linux-aarch/run_ssl_asan_tests.yml
-      env:
-        type: ARM_CONTAINER
-        privileged-mode: true
-        compute-type: BUILD_GENERAL1_LARGE
-        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:ubuntu-20.04_clang-9x_latest
-        variables:
-          AWS_LC_SSL_RUNNER_START_INDEX: 7001
-
     - identifier: ubuntu2004_clang10x_aarch
       buildspec: ./tests/ci/codebuild/linux-aarch/run_posix_tests.yml
       env:
@@ -239,3 +181,62 @@ batch:
         privileged-mode: true
         compute-type: BUILD_GENERAL1_LARGE
         image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:amazonlinux-2022_gcc-11x_latest
+
+    - identifier: amazonlinux_2022_clang_14x_sanitizer
+      buildspec: ./tests/ci/codebuild/linux-aarch/run_sanitizer_tests.yml
+      env:
+        type: ARM_CONTAINER
+        privileged-mode: true
+        compute-type: BUILD_GENERAL1_LARGE
+        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:amazonlinux-2022_clang-14x_sanitizer_latest
+
+    # BoringSSL has 7k+ ssl runner tests, and the total number of the runner tests keep increasing.
+    # When ASAN enabled, the tests take more than 1 hour to finish. The cause relates to https://github.com/google/sanitizers/issues/1331,
+    # https://github.com/google/sanitizers/issues/703, and fixed in https://reviews.llvm.org/D60243 which is pending a review.
+    # To reduce the total time, these tests will be executed in below CodeBuild dimensions:
+    #   1. amazonlinux_2022_clang_14x_ssl_asan1
+    #   2. amazonlinux_2022_clang_14x_ssl_asan2
+    #   3. amazonlinux_2022_clang_14x_ssl_asan3
+    #   4. amazonlinux_2022_clang_14x_ssl_asan4
+    # Env var |AWS_LC_SSL_RUNNER_START_INDEX| and |AWS_LC_SSL_RUNNER_END_INDEX| are used to filter the runner tests.
+    - identifier: amazonlinux_2022_clang_14x_ssl_asan1
+      buildspec: ./tests/ci/codebuild/linux-aarch/run_ssl_asan_tests.yml
+      env:
+        type: ARM_CONTAINER
+        privileged-mode: true
+        compute-type: BUILD_GENERAL1_LARGE
+        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:amazonlinux-2022_clang-14x_sanitizer_latest
+        variables:
+          AWS_LC_SSL_RUNNER_END_INDEX: 3500
+
+    - identifier: amazonlinux_2022_clang_14x_ssl_asan2
+      buildspec: ./tests/ci/codebuild/linux-aarch/run_ssl_asan_tests.yml
+      env:
+        type: ARM_CONTAINER
+        privileged-mode: true
+        compute-type: BUILD_GENERAL1_LARGE
+        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:amazonlinux-2022_clang-14x_sanitizer_latest
+        variables:
+          AWS_LC_SSL_RUNNER_START_INDEX: 3501
+          AWS_LC_SSL_RUNNER_END_INDEX: 5500
+
+    - identifier: amazonlinux_2022_clang_14x_ssl_asan3
+      buildspec: ./tests/ci/codebuild/linux-aarch/run_ssl_asan_tests.yml
+      env:
+        type: ARM_CONTAINER
+        privileged-mode: true
+        compute-type: BUILD_GENERAL1_LARGE
+        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:amazonlinux-2022_clang-14x_sanitizer_latest
+        variables:
+          AWS_LC_SSL_RUNNER_START_INDEX: 5501
+          AWS_LC_SSL_RUNNER_END_INDEX: 7000
+
+    - identifier: amazonlinux_2022_clang_14x_ssl_asan4
+      buildspec: ./tests/ci/codebuild/linux-aarch/run_ssl_asan_tests.yml
+      env:
+        type: ARM_CONTAINER
+        privileged-mode: true
+        compute-type: BUILD_GENERAL1_LARGE
+        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:amazonlinux-2022_clang-14x_sanitizer_latest
+        variables:
+          AWS_LC_SSL_RUNNER_START_INDEX: 7001

tests/ci/cdk/cdk/codebuild/github_ci_linux_x86_omnibus.yaml

@@ -122,14 +122,6 @@ batch:
         compute-type: BUILD_GENERAL1_LARGE
         image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-20.04_clang-9x_latest
 
-    - identifier: ubuntu2004_clang9x_x86_64_sanitizer
-      buildspec: ./tests/ci/codebuild/linux-x86/run_sanitizer_tests.yml
-      env:
-        type: LINUX_CONTAINER
-        privileged-mode: true
-        compute-type: BUILD_GENERAL1_LARGE
-        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-20.04_clang-9x_sanitizer_latest
-
     - identifier: ubuntu2004_clang10x_x86_64
       buildspec: ./tests/ci/codebuild/linux-x86/run_posix_tests.yml
       env:
@@ -256,6 +248,15 @@ batch:
         compute-type: BUILD_GENERAL1_LARGE
         image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:amazonlinux-2022_clang-14x_latest
 
+    - identifier: amazonlinux2022_clang14x_x86_64_sanitizer
+      buildspec: ./tests/ci/codebuild/linux-x86/run_sanitizer_tests.yml
+      env:
+        type: LINUX_CONTAINER
+        privileged-mode: true
+        compute-type: BUILD_GENERAL1_LARGE
+        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:amazonlinux-2022_clang-14x_sanitizer_latest
+
+
     - identifier: s2n_integration
       buildspec: ./tests/ci/codebuild/linux-x86/s2n_integration.yml
       env:

tests/ci/docker_images/linux-aarch/amazonlinux-2022_clang-14x_sanitizer/Dockerfile

@@ -0,0 +1,25 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0 OR ISC
+
+FROM amazonlinux-2022-aarch:clang-14x
+
+SHELL ["/bin/bash", "-c"]
+
+ENV DEPENDENCIES_DIR=/home/dependencies
+ENV LLVM_PROJECT_HOME=${DEPENDENCIES_DIR}/llvm-project
+
+RUN set -ex && \
+    yum -y update && yum install -y \
+    llvm \
+    llvm-devel \
+    lld && \
+    mkdir -p ${DEPENDENCIES_DIR} && \
+    cd ${DEPENDENCIES_DIR} && \
+    git clone https://github.com/llvm/llvm-project.git --branch llvmorg-14.0.5  --depth 1 && \
+    cd llvm-project && rm -rf $(ls -A | grep -Ev "(libcxx|libcxxabi)") && \
+    yum clean packages && \
+    yum clean metadata && \
+    yum clean all && \
+    rm -rf /tmp/* && \
+    rm -rf /var/cache/yum
+

tests/ci/docker_images/linux-aarch/build_images.sh

@@ -12,14 +12,14 @@ docker build -t amazonlinux-2-aarch:clang-7x amazonlinux-2_clang-7x
 docker build -t amazonlinux-2022-aarch:base amazonlinux-2022_base
 docker build -t amazonlinux-2022-aarch:gcc-11x amazonlinux-2022_gcc-11x
 docker build -t amazonlinux-2022-aarch:clang-14x amazonlinux-2022_clang-14x
+docker build -t amazonlinux-2022-aarch:clang-14x-sanitizer amazonlinux-2022_clang-14x_sanitizer
 docker build -t ubuntu-20.04-aarch:base ubuntu-20.04_base
 docker build -t ubuntu-20.04-aarch:gcc-7x ubuntu-20.04_gcc-7x
 docker build -t ubuntu-20.04-aarch:gcc-8x ubuntu-20.04_gcc-8x
 docker build -t ubuntu-20.04-aarch:clang-7x ubuntu-20.04_clang-7x
 docker build -t ubuntu-20.04-aarch:clang-8x ubuntu-20.04_clang-8x
 docker build -t ubuntu-20.04-aarch:clang-9x ubuntu-20.04_clang-9x
 docker build -t ubuntu-20.04-aarch:clang-10x ubuntu-20.04_clang-10x
-docker build -t ubuntu-20.04-aarch:clang-9x-sanitizer ubuntu-20.04_clang-9x_sanitizer
 docker build -t ubuntu-20.04-aarch:clang-7x-bm-framework ubuntu-20.04_clang-7x-bm-framework
 docker build -t ubuntu-22.04-aarch:base ubuntu-22.04_base
 docker build -t ubuntu-22.04-aarch:gcc-11x ubuntu-22.04_gcc-11x

tests/ci/docker_images/linux-aarch/push_images.sh

@@ -19,13 +19,13 @@ tag_and_push_img 'amazonlinux-2-aarch:gcc-7x' "${ECS_REPO}:amazonlinux-2_gcc-7x"
 tag_and_push_img 'amazonlinux-2-aarch:clang-7x' "${ECS_REPO}:amazonlinux-2_clang-7x"
 tag_and_push_img 'amazonlinux-2022-aarch:gcc-11x' "${ECS_REPO}:amazonlinux-2022_gcc-11x"
 tag_and_push_img 'amazonlinux-2022-aarch:clang-14x' "${ECS_REPO}:amazonlinux-2022_clang-14x"
+tag_and_push_img 'amazonlinux-2022-aarch:clang-14x-sanitizer' "${ECS_REPO}:amazonlinux-2022_clang-14x_sanitizer"
 tag_and_push_img 'ubuntu-20.04-aarch:gcc-7x' "${ECS_REPO}:ubuntu-20.04_gcc-7x"
 tag_and_push_img 'ubuntu-20.04-aarch:gcc-8x' "${ECS_REPO}:ubuntu-20.04_gcc-8x"
 tag_and_push_img 'ubuntu-20.04-aarch:clang-7x' "${ECS_REPO}:ubuntu-20.04_clang-7x"
 tag_and_push_img 'ubuntu-20.04-aarch:clang-8x' "${ECS_REPO}:ubuntu-20.04_clang-8x"
 tag_and_push_img 'ubuntu-20.04-aarch:clang-9x' "${ECS_REPO}:ubuntu-20.04_clang-9x"
 tag_and_push_img 'ubuntu-20.04-aarch:clang-10x' "${ECS_REPO}:ubuntu-20.04_clang-10x"
-tag_and_push_img 'ubuntu-20.04-aarch:clang-9x-sanitizer' "${ECS_REPO}:ubuntu-20.04_clang-9x_sanitizer"
 tag_and_push_img 'ubuntu-20.04-aarch:clang-7x-bm-framework' "${ECS_REPO}:ubuntu-20.04_clang-7x-bm-framework"
 tag_and_push_img 'ubuntu-20.04-aarch:cryptofuzz' "${ECS_REPO}:ubuntu-20.04_cryptofuzz"
 tag_and_push_img 'ubuntu-22.04-aarch:gcc-11x' "${ECS_REPO}:ubuntu-22.04_gcc-11x"

tests/ci/docker_images/linux-x86/amazonlinux-2022_clang-14x_sanitizer/Dockerfile

@@ -0,0 +1,24 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0 OR ISC
+
+FROM amazonlinux-2022:clang-14x
+
+SHELL ["/bin/bash", "-c"]
+
+ENV DEPENDENCIES_DIR=/home/dependencies
+ENV LLVM_PROJECT_HOME=${DEPENDENCIES_DIR}/llvm-project
+
+RUN set -ex && \
+    yum -y update && yum install -y \
+    llvm \
+    llvm-devel \
+    lld && \
+    mkdir -p ${DEPENDENCIES_DIR} && \
+    cd ${DEPENDENCIES_DIR} && \
+    git clone https://github.com/llvm/llvm-project.git --branch llvmorg-14.0.5  --depth 1 && \
+    cd llvm-project && rm -rf $(ls -A | grep -Ev "(libcxx|libcxxabi)") && \
+    yum clean packages && \
+    yum clean metadata && \
+    yum clean all && \
+    rm -rf /tmp/* && \
+    rm -rf /var/cache/yum

tests/ci/docker_images/linux-x86/build_images.sh

@@ -22,7 +22,6 @@ docker build -t ubuntu-20.04:clang-9x ubuntu-20.04_clang-9x
 docker build -t ubuntu-20.04:clang-10x ubuntu-20.04_clang-10x
 docker build -t ubuntu-20.04:android ubuntu-20.04_android
 docker build -t ubuntu-20.04:clang-7x-bm-framework ubuntu-20.04_clang-7x-bm-framework
-docker build -t ubuntu-20.04:clang-9x-sanitizer ubuntu-20.04_clang-9x_sanitizer
 # This passes in the Dockerfile in the folder but uses the parent directory for the context so it has access to cryptofuzz_data.zip
 docker build -t ubuntu-20.04:cryptofuzz -f ubuntu-20.04_cryptofuzz/Dockerfile ../
 docker build -t ubuntu-22.04:base ubuntu-22.04_base
@@ -35,6 +34,7 @@ docker build -t amazonlinux-2:clang-7x amazonlinux-2_clang-7x
 docker build -t amazonlinux-2022:base amazonlinux-2022_base
 docker build -t amazonlinux-2022:gcc-11x amazonlinux-2022_gcc-11x
 docker build -t amazonlinux-2022:clang-14x amazonlinux-2022_clang-14x
+docker build -t amazonlinux-2022:clang-14x-sanitizer amazonlinux-2022_clang-14x_sanitizer
 docker build -t ubuntu-16.04:gcc-5x ubuntu-16.04_gcc-5x
 docker build -t centos-7:gcc-4x centos-7_gcc-4x
 docker build -t fedora-31:clang-9x fedora-31_clang-9x

tests/ci/docker_images/linux-x86/push_images.sh

@@ -23,7 +23,6 @@ tag_and_push_img 'ubuntu-20.04:clang-8x' "${ECS_REPO}:ubuntu-20.04_clang-8x"
 tag_and_push_img 'ubuntu-20.04:clang-9x' "${ECS_REPO}:ubuntu-20.04_clang-9x"
 tag_and_push_img 'ubuntu-20.04:clang-10x' "${ECS_REPO}:ubuntu-20.04_clang-10x"
 tag_and_push_img 'ubuntu-20.04:android' "${ECS_REPO}:ubuntu-20.04_android"
-tag_and_push_img 'ubuntu-20.04:clang-9x-sanitizer' "${ECS_REPO}:ubuntu-20.04_clang-9x_sanitizer"
 tag_and_push_img 'ubuntu-20.04:clang-7x-bm-framework' "${ECS_REPO}:ubuntu-20.04_clang-7x-bm-framework"
 tag_and_push_img 'ubuntu-20.04:cryptofuzz' "${ECS_REPO}:ubuntu-20.04_cryptofuzz"
 tag_and_push_img 'ubuntu-20.04:clang-10x_formal-verification' "${ECS_REPO}:ubuntu-20.04_clang-10x_formal-verification"
@@ -37,5 +36,6 @@ tag_and_push_img 'amazonlinux-2:clang-7x' "${ECS_REPO}:amazonlinux-2_clang-7x"
 tag_and_push_img 'amazonlinux-2:gcc-7x-intel-sde' "${ECS_REPO}:amazonlinux-2_gcc-7x_intel-sde"
 tag_and_push_img 'amazonlinux-2022:gcc-11x' "${ECS_REPO}:amazonlinux-2022_gcc-11x"
 tag_and_push_img 'amazonlinux-2022:clang-14x' "${ECS_REPO}:amazonlinux-2022_clang-14x"
+tag_and_push_img 'amazonlinux-2022:clang-14x-sanitizer' "${ECS_REPO}:amazonlinux-2022_clang-14x_sanitizer"
 tag_and_push_img 'fedora-31:clang-9x' "${ECS_REPO}:fedora-31_clang-9x"
 tag_and_push_img 'ubuntu-10.04_gcc-4.1x' "${ECS_REPO}:ubuntu-10.04_gcc-4.1x"