From nobody Sat Dec 03 17:25:00 2022 X-Original-To: dev-commits-ports-main@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 4NPcBh6mlNz4hvBM; Sat, 3 Dec 2022 17:25:00 +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 4NPcBh6Ldmz45J4; Sat, 3 Dec 2022 17:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670088300; 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=186+Ue+N3H9wjx5sM8vvP2qIEw471xLixZLppKHxRzI=; b=B24d1v5lJiFBY5G7Z3/r9IXT7Ftbwcs28zBICIWA19E4i4dztzHRW3CHpg4KW5ksxE/iC5 dNHsMLfd/HaYK+pWlAKEeLp+QhmUxfdIrrqRk+UMpy5g21YQkzONAAcGG8zBxNzJxGX/Gw G5gQzWLsWqq1NjZ64S/d2WF6N9zriVNOPI21oKgfzjvcgP53So5Ev1p7n48x20N4WdkKbo /LiS76JiaFs8fkDjUjuzUD5dLKZePGKgI+lNtzmf0G28tZLxNVfAw3rqGroKN60xVWGbDw 27s3AAhHTtuJE2TxcmSPcPqKqfSJrfL7XznaPyGJfUFXwFYGBVKouhlmQr2q1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670088300; 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=186+Ue+N3H9wjx5sM8vvP2qIEw471xLixZLppKHxRzI=; b=RE9bEiFbK0QkGu0tk+c63yGztPOs1q2tbKIaPweOz2pOkbeGKrNYfIAGG8BZxJ8X645/Du nxuz49Y/ZPFyazS3Aktj7AePK+DdMWWVKfzb1bzvUsouvgH2+mM8ag4v/l6osrCGjQUP7j raEWOxmem9pvHBY5dybU26wNDtMWsEhzAGtHb7dilwAGMXKr2Oy//0+4xoPQRdcFfitcH1 8XZDa9njR/cR9Ot0zNnm2xegx4yT7VCra0baUCbJ4g23mCSOfNuloLsUjWH/rGqi/ay2Kx xvXNxUHgWMZi/fkOQ3H9aVzg3oLrjGbzx/y7wySKv/dz7FcdK+lOsnmeeZIFpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670088300; a=rsa-sha256; cv=none; b=XVF5OPU8bd7ipdLEw3dulPXJ0Oddor7Z3/gR9EbolcoRuD5YVtU6eUdfMIKig5ZtVQjhDW LzmvgDg2JFbOyJRXhNIpHx/I2d/2HJ88qc+LNH9y5r+eA+jHzkG2r8GmLH32JnfQnQvLCh cDRul9fnuBNbQ3pi6QYv6ZV4zc7OW1f9O66dKa7FBBvG4vaeWaPQ6RMtFelPrFu0lcewqn rURMikYEDfAdKqGQLifDpjl48M7GLthrwwhMQcFbffr5rk/8+Hx80RpQ0rWIRyHGfiNau8 HZUJILJy/N+6cCKhP71+X5veTCcHOwVr8XzxMy8Vk9qpf7iacF10nlq327nRFA== 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 4NPcBh53wqz1389; Sat, 3 Dec 2022 17:25:00 +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 2B3HP0e3021247; Sat, 3 Dec 2022 17:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B3HP0kl021246; Sat, 3 Dec 2022 17:25:00 GMT (envelope-from git) Date: Sat, 3 Dec 2022 17:25:00 GMT Message-Id: <202212031725.2B3HP0kl021246@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: a051e5a32dd9 - main - lang/gcc11: Re-execute program with ASLR disabled when necessary List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: a051e5a32dd9b36fe2b03fe152b94ee2cdce4926 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=a051e5a32dd9b36fe2b03fe152b94ee2cdce4926 commit a051e5a32dd9b36fe2b03fe152b94ee2cdce4926 Author: Lorenzo Salvadore AuthorDate: 2022-11-26 22:13:47 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-12-03 17:24:17 +0000 lang/gcc11: 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/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/Makefile b/lang/gcc11/Makefile index 2e9c25e83c4f..0dc1f02f0803 100644 --- a/lang/gcc11/Makefile +++ b/lang/gcc11/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 11.3.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= lang MASTER_SITES= GCC PKGNAMESUFFIX= ${SUFFIX} diff --git a/lang/gcc11/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp b/lang/gcc11/files/patch-libsanitizer_sanitizer__common_sanitizer__linux.cpp new file mode 100644 index 000000000000..bf9b0df79e0b --- /dev/null +++ b/lang/gcc11/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/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp b/lang/gcc11/files/patch-libsanitizer_sanitizer__common_sanitizer__linux__libcdep.cpp new file mode 100644 index 000000000000..7f13f8591313 --- /dev/null +++ b/lang/gcc11/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,