Revert "[3.15] Add MSan to CI (GH-158625) (#158832)"

This reverts commit 1bc78de.

Author: pablogsal

.github/workflows/build.yml

@@ -605,9 +605,6 @@ jobs:
         - check-name: Undefined behavior
           sanitizer: UBSan
           free-threading: false
-        - check-name: Memory
-          sanitizer: MSan
-          free-threading: false
     uses: ./.github/workflows/reusable-san.yml
     with:
       sanitizer: ${{ matrix.sanitizer }}

.github/workflows/reusable-san.yml

@@ -60,7 +60,7 @@ jobs:
             || ''
           }}
     - name: UBSan option setup
-      if: inputs.sanitizer == 'UBSan'
+      if: inputs.sanitizer != 'TSan'
       run: >-
         echo
         "UBSAN_OPTIONS=${SAN_LOG_OPTION}
@@ -69,20 +69,6 @@ jobs:
         >> "$GITHUB_ENV"
       env:
         SAN_LOG_OPTION: log_path=${{ github.workspace }}/san_log
-    - name: MSan option setup
-      if: inputs.sanitizer == 'MSan'
-      run: |
-        echo "MSAN_OPTIONS=${SAN_LOG_OPTION} allocator_may_return_null=1 handle_segv=0" >> "$GITHUB_ENV"
-        # MSan reports false positives for memory initialized by libraries
-        # that are not built with MSan, so disable modules that use them.
-        # _remote_debugging links to libzstd directly, but we unpoision the memory.
-        {
-          echo '*disabled*'
-          echo '_bz2 _ctypes _curses _curses_panel _dbm _decimal _gdbm _hashlib'
-          echo '_lzma _sqlite3 _ssl _tkinter _uuid _zstd readline zlib'
-        } > Modules/Setup.local
-      env:
-        SAN_LOG_OPTION: log_path=${{ github.workspace }}/san_log
     - name: Add ccache to PATH
       run: |
         echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
@@ -107,8 +93,6 @@ jobs:
     # gh-157958: -O2 instead of the pydebug default -Og to avoid a clang 21
     # compile-time blowup on some interpreter files.
     # (https://github.com/llvm/llvm-project/issues/179695)
-    # MSan uses --with-assertions instead of --with-pydebug because its
-    # hooks on the Python memory allocators hide uninitialized reads.
     - name: Configure CPython
       run: >-
         ./configure
@@ -117,11 +101,9 @@ jobs:
         ${{
           inputs.sanitizer == 'TSan'
           && '--with-thread-sanitizer'
-          || inputs.sanitizer == 'MSan'
-          && '--with-memory-sanitizer'
           || '--with-undefined-behavior-sanitizer --with-strict-overflow'
         }}
-        ${{ inputs.sanitizer == 'MSan' && '--with-assertions' || '--with-pydebug' }}
+        --with-pydebug
         ${{ inputs.sanitizer == 'TSan' && '--with-openssl="$OPENSSL_DIR" --with-openssl-rpath=auto' || '' }}
         ${{ inputs.free-threading && '--disable-gil' || '' }}
     - name: Build CPython

Doc/using/configure.rst

@@ -1015,10 +1015,6 @@ Debug options
 
    Enable MemorySanitizer allocation error detector, ``msan`` (default is no).
 
-   MSan reports false positives for memory initialized by libraries that are
-   not built with MSan, so either build all dependencies with MSan or disable
-   the extension modules that use them in :file:`Modules/Setup.local`.
-
    .. versionadded:: 3.6
 
 .. option:: --with-undefined-behavior-sanitizer

Include/pyport.h

@@ -554,7 +554,6 @@ extern "C" {
 #      define _Py_MEMORY_SANITIZER
 #      define _Py_NO_SANITIZE_MEMORY __attribute__((no_sanitize_memory))
 #      define _Py_MSAN_UNPOISON(PTR, SIZE)  (__msan_unpoison(PTR, SIZE))
-#      define _Py_MSAN_UNPOISON_STRING(STR)  (__msan_unpoison_string(STR))
 #    endif
 #  endif
 #  if __has_feature(address_sanitizer)
@@ -596,9 +595,6 @@ extern "C" {
 #ifndef _Py_MSAN_UNPOISON
 #  define _Py_MSAN_UNPOISON(PTR, SIZE)
 #endif
-#ifndef _Py_MSAN_UNPOISON_STRING
-#  define _Py_MSAN_UNPOISON_STRING(STR)
-#endif
 
 /* AIX has __bool__ redefined in it's system header file. */
 #if defined(_AIX) && defined(__bool__)

Lib/test/test_faulthandler.py

@@ -34,8 +34,8 @@
 
 
 def skip_if_sanitizer_signal(signame):
-    return support.skip_if_sanitizer(f"TSan/UBSan/MSan intercepts {signame}",
-                                     thread=True, ub=True, memory=True)
+    return support.skip_if_sanitizer(f"TSAN/UBSan itercepts {signame}",
+                                     thread=True, ub=True)
 
 
 def expected_traceback(lineno1, lineno2, header, min_count=1):

Modules/_remote_debugging/binary_io_reader.c

@@ -19,10 +19,6 @@
 #include <zstd.h>
 #endif
 
-#ifdef _Py_MEMORY_SANITIZER
-#  include <sanitizer/msan_interface.h>
-#endif
-
 /* ============================================================================
  * CONSTANTS FOR BINARY FORMAT SIZES
  * ============================================================================ */
@@ -319,7 +315,6 @@ reader_decompress_samples(BinaryReader *reader, const uint8_t *data)
             return -1;
         }
 
-        _Py_MSAN_UNPOISON(output.dst, output.pos);
         total_output += output.pos;
     }
 

Modules/_remote_debugging/binary_io_writer.c

@@ -19,10 +19,6 @@
 #include <zstd.h>
 #endif
 
-#ifdef _Py_MEMORY_SANITIZER
-#  include <sanitizer/msan_interface.h>
-#endif
-
 /* ============================================================================
  * CONSTANTS FOR BINARY FORMAT SIZES
  * ============================================================================ */
@@ -239,7 +235,6 @@ writer_flush_buffer(BinaryWriter *writer)
                 return -1;
             }
 
-            _Py_MSAN_UNPOISON(writer->zstd.compressed_buffer, output.pos);
             if (output.pos > 0) {
                 if (fwrite_checked_allow_threads(writer->zstd.compressed_buffer, output.pos, writer->fp) < 0) {
                     return -1;
@@ -1109,7 +1104,6 @@ binary_writer_finalize(BinaryWriter *writer)
                 return -1;
             }
 
-            _Py_MSAN_UNPOISON(writer->zstd.compressed_buffer, output.pos);
             if (output.pos > 0) {
                 if (fwrite_checked_allow_threads(writer->zstd.compressed_buffer, output.pos, writer->fp) < 0) {
                     return -1;

Modules/_testinternalcapi.c

@@ -438,7 +438,7 @@ next_frame_pointer_is_valid(uintptr_t *frame_pointer, uintptr_t *next_fp,
 #endif
 }
 
-static PyObject * _Py_NO_SANITIZE_MEMORY
+static PyObject *
 manual_unwind_from_fp(uintptr_t *frame_pointer)
 {
     uintptr_t stack_min = 0;
@@ -2049,8 +2049,8 @@ check_pyobject_forbidden_bytes_is_freed(PyObject *self,
 static PyObject *
 check_pyobject_freed_is_freed(PyObject *self, PyObject *Py_UNUSED(args))
 {
-    /* ASan, MSan or TSan would report an error. */
-#if defined(_Py_ADDRESS_SANITIZER) || defined(_Py_THREAD_SANITIZER) || defined(_Py_MEMORY_SANITIZER)
+    /* ASan or TSan would report an use-after-free error */
+#if defined(_Py_ADDRESS_SANITIZER) || defined(_Py_THREAD_SANITIZER)
     Py_RETURN_NONE;
 #else
     PyObject *op = PyObject_CallNoArgs((PyObject *)&PyBaseObject_Type);

Modules/posixmodule.c

@@ -10137,7 +10137,6 @@ os_getlogin_impl(PyObject *module)
         errno = old_errno;
     }
     else {
-        _Py_MSAN_UNPOISON(name, sizeof(name));
         result = PyUnicode_DecodeFSDefault(name);
     }
 #else

Modules/socketmodule.c

@@ -754,9 +754,7 @@ set_herror(socket_state *state, int h_error)
     PyObject *v;
 
 #ifdef HAVE_HSTRERROR
-    const char *errmsg = hstrerror(h_error);
-    _Py_MSAN_UNPOISON_STRING(errmsg);
-    v = Py_BuildValue("(iN)", h_error, decode_error_message(errmsg));
+    v = Py_BuildValue("(iN)", h_error, decode_error_message(hstrerror(h_error)));
 #else
     v = Py_BuildValue("(is)", h_error, "host not found");
 #endif
@@ -783,9 +781,7 @@ set_gaierror(socket_state *state, int error)
 #endif
 
 #ifdef HAVE_GAI_STRERROR
-    const char *errmsg = gai_strerror(error);
-    _Py_MSAN_UNPOISON_STRING(errmsg);
-    v = Py_BuildValue("(iN)", error, decode_error_message(errmsg));
+    v = Py_BuildValue("(iN)", error, decode_error_message(gai_strerror(error)));
 #else
     v = Py_BuildValue("(is)", error, "getaddrinfo failed");
 #endif
@@ -6424,7 +6420,6 @@ socket_getservbyport(PyObject *self, PyObject *args)
         PyErr_SetString(PyExc_OSError, "port/proto not found");
         return NULL;
     }
-    _Py_MSAN_UNPOISON_STRING(sp->s_name);
     return PyUnicode_FromString(sp->s_name);
 }