From nobody Sat Nov 26 15:04:38 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NKFPz0KhXz4jYpy; Sat, 26 Nov 2022 15:04:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NKFPy5pQjz3n2P; Sat, 26 Nov 2022 15:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669475078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EHK5AmQQ+zs9dSiKeAAXe7tVbSdu5kfAicI/YWAjork=; b=eG4oCfxtgQiHr+BEe8MYzeMrh1ZBPQr3Jjs6Yvmkzp1M471zcOFELs//gY1sHSgN+gCW9E QNDJDhMnOhwfxALpbuEvF4tMWd3cMpMBg7ewzbCq0v9toXHcrVMJAnDZdFMUw7I6aeLilF PaXxZQ+y/8v3LWMkiWaRCPFXu3Sz+h2+G99l9zh0lkYJvRgdnSCa1GBwiWBCHDCJNwY0vw tuSdbtl/TdgVnsG5+OA6+ha0UOUC5jKmIag8Vk355OrU4l6LhHqv8jkzjerPJ5FHmSSP0+ xbs8b3O7qAo2RB6R2l0fQlFqSsGxyN2QwvEkPUvwtUi03ueQZMhbs7kqWJWZkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669475078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EHK5AmQQ+zs9dSiKeAAXe7tVbSdu5kfAicI/YWAjork=; b=LIBct5VkwfbzX8/LksCKyEU5XonMsAUBtGviVwKKoXIbXL/xRtHobImNo1qvKGOuXoX/BY adGhukleUlkuMe2r89o6BAdyQ9Jbj4vHPtLaFdGIRGJbRz6bKIFxcIlikDF21/Au3hTCbd o4T1tEMBLWAwdeUGuw3DjWCFghA+fQfhm0U1vICYSZ5Vfsx4xO9WA3LhpQSB53MIpQjOHR XGoq3CJvoW4EwkV4OXT9vPxHgaOXnh+PAOa9YWyCn67XbI3vUJtOCKNGhAfSO+gLGLHJNH NXSCRULNaAnipvhDVJwkA1o7osAnVgVi2loVwxx+RelgF6XQLnBeY0j4G0u4ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669475078; a=rsa-sha256; cv=none; b=FEa8QO6aqASvsOS+pImA0LATt1pP3oux7ZiVyQAZf4vF5vyj68kTNsNnIosf7w0/WTGo6L /qAjFPoTd14xR+3fp5B63Imrsz0k+lFTfo+kjFBxzE43CR3Ehy9ylXDQf/UsBMj8YeOn5i utUAR6+kua8LyR2EGDuKSFgQ5pEsn3vo/P8F378iDhbkLeuiOoJtvO3K995VCgrXWP5wbC iX6cMsZplT0U3b08Jn176imVR6q3byBsKIEvREsXvAqqu1hRlL9VdBD2Futq6TzbrJM8N8 o4Sd5711jWp2irpNNecpjzyKH5Fvy/XGCabFsG1d8erffSpWMVkWigGlzgIjnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NKFPy4KC2zNy2; Sat, 26 Nov 2022 15:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AQF4cLp095783; Sat, 26 Nov 2022 15:04:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AQF4cSc095782; Sat, 26 Nov 2022 15:04:38 GMT (envelope-from git) Date: Sat, 26 Nov 2022 15:04:38 GMT Message-Id: <202211261504.2AQF4cSc095782@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lorenzo Salvadore Subject: git: 2b4f6e6f7a0b - main - lang/gcc11-devel: Re-execute program with ASLR disabled when necessary List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b4f6e6f7a0b36f4592dc0058e12f55b668d6be2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b4f6e6f7a0b36f4592dc0058e12f55b668d6be2 commit 2b4f6e6f7a0b36f4592dc0058e12f55b668d6be2 Author: Lorenzo Salvadore AuthorDate: 2022-11-25 22:52:13 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-11-26 15:02:45 +0000 lang/gcc11-devel: Re-execute program with ASLR disabled when necessary Software compiled with -fsanitize=address needs ASLR to be disabled to run successfully. Add patches taken from the commits listed below that improve ASLR detection and re-execute the program with ASLR disabled if necessary. https://cgit.freebsd.org/src/commit/?id=7cafe89f9ce33effe6e471b185339d413da1ca46 https://cgit.freebsd.org/src/commit/?id=930a7c2ac67e1e8e511aa1d0a31a16c632060ebb https://cgit.freebsd.org/src/commit/?id=96fe7c8ab0f65cf829619abd74ae6c126b21e15f PR: 267751 --- lang/gcc11-devel/Makefile | 2 +- ...anitizer_sanitizer__common_sanitizer__linux.cpp | 61 ++++++++++++++++++++++ ...sanitizer__common_sanitizer__linux__libcdep.cpp | 32 ++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/lang/gcc11-devel/Makefile b/lang/gcc11-devel/Makefile index cde3eccb4a71..cc7612307799 100644 --- a/lang/gcc11-devel/Makefile +++ b/lang/gcc11-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 11.3.1.s20221118 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc11-devel/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp b/lang/gcc11-devel/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp new file mode 100644 index 000000000000..bf9b0df79e0b --- /dev/null +++ b/lang/gcc11-devel/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp @@ -0,0 +1,61 @@ +Patch taken from the following commits: + +- https://cgit.freebsd.org/src/commit/?id=7cafe89f9ce33effe6e471b185339d413da1ca46 +- https://cgit.freebsd.org/src/commit/?id=930a7c2ac67e1e8e511aa1d0a31a16c632060ebb + +--- libsanitizer/sanitizer_common/sanitizer_linux.cpp.orig 2022-11-26 10:40:30 UTC ++++ libsanitizer/sanitizer_common/sanitizer_linux.cpp +@@ -80,6 +80,7 @@ + + #if SANITIZER_FREEBSD + #include ++#include + #include + #include + extern "C" { +@@ -2171,33 +2172,20 @@ void CheckASLR() { + ReExec(); + } + #elif SANITIZER_FREEBSD +- int aslr_pie; +- uptr len = sizeof(aslr_pie); +-#if SANITIZER_WORDSIZE == 64 +- if (UNLIKELY(internal_sysctlbyname("kern.elf64.aslr.pie_enable", +- &aslr_pie, &len, NULL, 0) == -1)) { +- // We're making things less 'dramatic' here since +- // the OID is not necessarily guaranteed to be here ++ int aslr_status; ++ if (UNLIKELY(procctl(P_PID, 0, PROC_ASLR_STATUS, &aslr_status) == -1)) { ++ // We're making things less 'dramatic' here since ++ // the cmd is not necessarily guaranteed to be here + // just yet regarding FreeBSD release + return; +- } +- +- if (aslr_pie > 0) { +- Printf("This sanitizer is not compatible with enabled ASLR " +- "and binaries compiled with PIE\n"); +- Die(); +- } +-#endif +- // there might be 32 bits compat for 64 bits +- if (UNLIKELY(internal_sysctlbyname("kern.elf32.aslr.pie_enable", +- &aslr_pie, &len, NULL, 0) == -1)) { +- return; +- } +- +- if (aslr_pie > 0) { +- Printf("This sanitizer is not compatible with enabled ASLR " +- "and binaries compiled with PIE\n"); +- Die(); ++ } ++ if ((aslr_status & PROC_ASLR_ACTIVE) != 0) { ++ VReport(1, "This sanitizer is not compatible with enabled ASLR " ++ "and binaries compiled with PIE\n" ++ "ASLR will be disabled and the program re-executed.\n"); ++ int aslr_ctl = PROC_ASLR_FORCE_DISABLE; ++ CHECK_NE(procctl(P_PID, 0, PROC_ASLR_CTL, &aslr_ctl), -1); ++ ReExec(); + } + #else + // Do nothing diff --git a/lang/gcc11-devel/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp b/lang/gcc11-devel/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp new file mode 100644 index 000000000000..7f13f8591313 --- /dev/null +++ b/lang/gcc11-devel/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp @@ -0,0 +1,32 @@ +Patch taken from + +https://cgit.freebsd.org/src/commit/?id=96fe7c8ab0f65cf829619abd74ae6c126b21e15f + +--- libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp.orig 2022-11-26 09:47:34 UTC ++++ libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp +@@ -45,7 +45,9 @@ + + #if SANITIZER_FREEBSD + #include ++#include + #include ++#include + #include + #define pthread_getattr_np pthread_attr_get_np + #endif +@@ -857,7 +859,14 @@ void ReExec() { + void ReExec() { + const char *pathname = "/proc/self/exe"; + +-#if SANITIZER_NETBSD ++#if SANITIZER_FREEBSD ++ char exe_path[PATH_MAX]; ++ if (elf_aux_info(AT_EXECPATH, exe_path, sizeof(exe_path)) == 0) { ++ char link_path[PATH_MAX]; ++ if (realpath(exe_path, link_path)) ++ pathname = link_path; ++ } ++#elif SANITIZER_NETBSD + static const int name[] = { + CTL_KERN, + KERN_PROC_ARGS,