On Thu, Apr 04, 2024 at 02:19:08PM +0200, Andreas Krebbel wrote: > On 4/4/24 13:38, Ilya Leoshkevich wrote: > > Bootstrapped and regtested on s390x-redhat-linux. Ok for master? > > > > > > libsanitizer/ChangeLog: > > > > * sanitizer_common/sanitizer_linux_s390.cpp (AvoidCVE_2016_2143): > > Do not mention MSan and DFSan, which are not supported by GCC. > > Ok, Thanks!
This then needs to be added to libsanitizer/LOCAL_PATCHES , otherwise it will disappear on the next merge from upstream. Though, I must say I'm not entirely convinced the change is worth the hassle on every libsanitizer merge. > > diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_s390.cpp > > b/libsanitizer/sanitizer_common/sanitizer_linux_s390.cpp > > index 74db831b0aa..65ba825fa97 100644 > > --- a/libsanitizer/sanitizer_common/sanitizer_linux_s390.cpp > > +++ b/libsanitizer/sanitizer_common/sanitizer_linux_s390.cpp > > @@ -212,7 +212,7 @@ void AvoidCVE_2016_2143() { > > return; > > Report( > > "ERROR: Your kernel seems to be vulnerable to CVE-2016-2143. Using > > ASan,\n" > > - "MSan, TSan, DFSan or LSan with such kernel can and will crash your\n" > > + "TSan or LSan with such kernel can and will crash your\n" > > "machine, or worse.\n" > > "\n" > > "If you are certain your kernel is not vulnerable (you have compiled > > it\n" Jakub