diff options
Diffstat (limited to 'external/python3/ubsan.patch.0')
-rw-r--r-- | external/python3/ubsan.patch.0 | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/external/python3/ubsan.patch.0 b/external/python3/ubsan.patch.0 index 36d2acf1c947..d44fbe055c86 100644 --- a/external/python3/ubsan.patch.0 +++ b/external/python3/ubsan.patch.0 @@ -1,25 +1,3 @@ ---- Modules/_ctypes/libffi/src/x86/ffi64.c -+++ Modules/_ctypes/libffi/src/x86/ffi64.c -@@ -548,11 +548,15 @@ - tramp = (volatile unsigned short *) &closure->tramp[0]; - - tramp[0] = 0xbb49; /* mov <code>, %r11 */ -- *((unsigned long long * volatile) &tramp[1]) -- = (unsigned long) ffi_closure_unix64; -+ tramp[1] = (unsigned long) ffi_closure_unix64; -+ tramp[2] = ((unsigned long) ffi_closure_unix64) >> 16; -+ tramp[3] = ((unsigned long) ffi_closure_unix64) >> 32; -+ tramp[4] = ((unsigned long) ffi_closure_unix64) >> 48; - tramp[5] = 0xba49; /* mov <data>, %r10 */ -- *((unsigned long long * volatile) &tramp[6]) -- = (unsigned long) codeloc; -+ tramp[6] = (unsigned long) codeloc; -+ tramp[7] = ((unsigned long) codeloc) >> 16; -+ tramp[8] = ((unsigned long) codeloc) >> 32; -+ tramp[9] = ((unsigned long) codeloc) >> 48; - - /* Set the carry bit iff the function uses any sse registers. - This is clc or stc, together with the first byte of the jmp. */ --- Modules/_ctypes/libffi_osx/x86/x86-ffi64.c +++ Modules/_ctypes/libffi_osx/x86/x86-ffi64.c @@ -599,9 +599,15 @@ @@ -40,3 +18,26 @@ /* Set the carry bit if the function uses any sse registers. This is clc or stc, together with the first byte of the jmp. */ +--- Modules/posixmodule.c ++++ Modules/posixmodule.c +@@ -13998,6 +13998,9 @@ + }; + + static int ++#if defined __clang__ ++__attribute__((no_sanitize("shift-base"))) // MFD_HUGE_16GB in /usr/include/linux/memfd.h ++#endif + all_ins(PyObject *m) + { + #ifdef F_OK +--- Objects/listobject.c ++++ Objects/listobject.c +@@ -554,7 +554,7 @@ + dest[i] = v; + } + src = b->ob_item; +- dest = np->ob_item + Py_SIZE(a); ++ dest = Py_SIZE(a) == 0 ? np->ob_item : np->ob_item + Py_SIZE(a); + for (i = 0; i < Py_SIZE(b); i++) { + PyObject *v = src[i]; + Py_INCREF(v); |