From nobody Wed Nov 30 12:53:33 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 4NMfJs3JZ2z4fw9Y; Wed, 30 Nov 2022 12:53:33 +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 4NMfJs2tPdz3Ndt; Wed, 30 Nov 2022 12:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669812813; 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=PpsuMAjdnKgcGXS/bHIvyYUmKUxfMy02uSDJ2mRMZIk=; b=Rd3g7THmFv2Lla4wMPq6DKRXkuNDmUaBw/2dMnTTGg6S0SGiELtbznLyN3EsBQ2bmIihvm ds1adLhzSwkJsre4uk4iEGA3K7+rIIq5ghiupC+6AjRJ//HTKYoteV/0oXj0gcULJFHVi2 YlZs3hlCFUugiyV6t5q6OzsVnzYl8kg+B/XduihBo/7xhUo5KYJj8FtDqlrlzjde15JoWQ 08uKhJ+my3okN8+Gl5l4QYTT6tIb3vNPNq4W9S9HMsAzGgGUDnSdL1YuiK7o5GOSROJGcZ gG9LU/dHhrerVCNr9yk9EDWejL6RT/XATrSJ+3E5wEB2Nb1SjS9HJRDG18QucQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669812813; 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=PpsuMAjdnKgcGXS/bHIvyYUmKUxfMy02uSDJ2mRMZIk=; b=KxC1tJpTsX8caD5cCfPTKIDYt7BuQNTBm90EJ2aAFnEa9vG1SykvnNLTCgNKSon2XyEYuO H72D+ZlF9B2b5cdTLIH+Md1UfxonBORx2lR5iTXRjsE4rZU5l3F/ZIy/Ec2I9lzpKGOM/q Bqv1kNjToawDVfZ3yMT5P8qnkK/IOSUdt4wsT/YBE1VZHl9SKDwLYEaTI6ONmpyIERpTvW ckcyIedxFv0q8Kudv77xBYyGPPyeJwky56vmoA+CX7aYlKsJ81Hc6K3aCZ7mdPn9XMESqA /9CLVKBI2yZi+jNibHwB2iho81ylV5ChemZyAQrqxSW2p54Gg5O9862PgtzzYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669812813; a=rsa-sha256; cv=none; b=Gc7HFPihv/j6o9RFVUzQ/c8Qkig7xQ1xbNWw1eupJdco08SlUKs4Y/tBCir+xcIWpaujHv hLsZ7ec32AzriNZArS3m7PcJty10O4iGh2Ks+KDNzYxWJVL/OnBDd1KJ4x2X+DU9DbLiPJ 6QJ1foGUaGH2tySez+9R6x+p5KAxkji1p5IbkhES4wuoLXjs7ecvqpXwNfIOQKTMuVVLL+ bi7kzFr9lcwUqW3UMMiL7l7nVv2ni/TSYxCP2SfppYzZJIdXZFj7NX7/RT9w6SZVPTfTPj Hi9tC19o2hYEaO8fM4bMiw3fblw0dwFq96t3gg0mBjnaYhkeUpKeWlw+ZXFjnA== 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 4NMfJs1xMtzxgx; Wed, 30 Nov 2022 12:53:33 +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 2AUCrX9Q090597; Wed, 30 Nov 2022 12:53:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AUCrX35090596; Wed, 30 Nov 2022 12:53:33 GMT (envelope-from git) Date: Wed, 30 Nov 2022 12:53:33 GMT Message-Id: <202211301253.2AUCrX35090596@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: d187c559f003 - main - lang/gcc12: 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: d187c559f003650fe5eb4b9bcdc499f623d3b4a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=d187c559f003650fe5eb4b9bcdc499f623d3b4a3 commit d187c559f003650fe5eb4b9bcdc499f623d3b4a3 Author: Lorenzo Salvadore AuthorDate: 2022-11-26 22:04:19 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-11-30 12:52:57 +0000 lang/gcc12: 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/gcc12/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/gcc12/Makefile b/lang/gcc12/Makefile index 5d7601f3635f..3987299d1cab 100644 --- a/lang/gcc12/Makefile +++ b/lang/gcc12/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 12.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= GCC PKGNAMESUFFIX= ${SUFFIX} diff --git a/lang/gcc12/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp b/lang/gcc12/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp new file mode 100644 index 000000000000..bf9b0df79e0b --- /dev/null +++ b/lang/gcc12/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/gcc12/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp b/lang/gcc12/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp new file mode 100644 index 000000000000..7f13f8591313 --- /dev/null +++ b/lang/gcc12/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,