From nobody Sat Jan 13 08:18:49 2024 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 4TBrs54hyCz574dt; Sat, 13 Jan 2024 08:18:49 +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 4TBrs549kRz4dpr; Sat, 13 Jan 2024 08:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705133929; 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=PUcg3DwSrOqtLIqIlJvOuVpFGV5Xy1WR+Z05IXl6rOQ=; b=l1JkoNbYWYTemqyUSLZClAdxfuGCRwVKgbtxqVKeDDnNq9k3YRt0u9cSrVhfWW8zfJ0uQN WA0sNJ66ybGrwGaJGUxEV7E3zOm6bpGOxVuG/vn3atRUpCxyyk3qUV/n6cBaYNrasr4/4B OFYKX7VhV1VYF5q8GabH0t7wziW/WZyK5jfnvnqMChyUYpn7wAPb5pwa4Lyj7Kyb/9eTXd lTShkOvhcQOFqSaBgzewE29PdwhmKPTAoXLrZTxD5S6bmNNSS3EugwSr77OR3tmryEGMqd suJhiIW1rRNjCCjy+ihPtE6pDpT6jZsVTNbw3JFyKEjROsPUyebYnUhMi9vKPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705133929; 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=PUcg3DwSrOqtLIqIlJvOuVpFGV5Xy1WR+Z05IXl6rOQ=; b=Ytl9eS3P2cDWLmStC+keUIyt0pzGOvDGbsg9dacKKZkTruOa/vNq3leCdkBWwoijRRPZ7D OmIC1r/OuEJrqFeFMmqDU4QwW3w6JsBwKK6xh5N4F8tIcm3Tt74QLrIHn7FmKkhnWkPWYA mdTYl8T1ZUY0XngtDZfaJEEigLK9djCUuFCypNBaFEIG1UiZN/loo7ojKvI61rQymm7BKP 2t5HE9QZ6F42MXNJlXFPHZiMwACcq5T4tRLusZNWWXUbbW3bHg38LslgQlLTxCYOH6tUKm ZfNohw0vbpf0IDWj3rcXckXaC6MI56vxjdPn1ViBAveJB52eZzBaWVKBusPOcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705133929; a=rsa-sha256; cv=none; b=YOtklSQpUc5Ill2N8S66xJGkFKFdkAuZmS+3kQgkHBZqd93LEmIwNID5dXlscKTRIVY6nE +wES0hLRGzTXqbmpip7KIHZqc51nrac0Bay9r9ZH8yHwrgWCOSx73AmOnRua0dHRSJXIER RMNQwNpYmJflwFZe0x4h4stuvsv99ZCkx4izG3z7Jb7iuqgAxMN1Ea4vEAoYfDyAkDS07C 5y7+3+MSTYD5OtcHWjbRiUaOXCTuf0lNc45k3XJ4nc+AyPrwNP8lqqBQd9VyuyKDWyNVEV PD/ZVMHp7vpNAJLvLwOfJCJc3L9dsc3vnYZC2TjjBldy0txGa5hwX/NBbH9UuA== 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 4TBrs53DCJzN9b; Sat, 13 Jan 2024 08:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40D8Intu050879; Sat, 13 Jan 2024 08:18:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40D8InZI050876; Sat, 13 Jan 2024 08:18:49 GMT (envelope-from git) Date: Sat, 13 Jan 2024 08:18:49 GMT Message-Id: <202401130818.40D8InZI050876@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: 9c8633f6b206 - main - lang/gcc13-devel: Fix Address sanitizer 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: 9c8633f6b2061d35c78e745fbafb7666357eaa8e Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c8633f6b2061d35c78e745fbafb7666357eaa8e commit 9c8633f6b2061d35c78e745fbafb7666357eaa8e Author: Lorenzo Salvadore AuthorDate: 2022-11-23 11:51:44 +0000 Commit: Lorenzo Salvadore CommitDate: 2024-01-13 08:17:23 +0000 lang/gcc13-devel: Fix Address sanitizer Software compiled with -fsanitize=address fails to run with the error message "ASan runtime does not come first in initial library list; you should either link runtime to your application or manually preload it with LD_PRELOAD". This commit fixes the issue by ignoring the [vdso] loaded shared library instead of linux-vdso.so. To successfully run the software compiled with -fsanitize=address it is still necessary to disable ASLR. PR: 267751 Reported by: yuri Co-authored-by: Andreas Tobler --- lang/gcc13-devel/Makefile | 2 +- .../files/patch-libsanitizer_asan_asan__linux.cpp | 23 ++++++++++++++++++++++ .../files/patch-libsanitizer_asan_asan__thread.cpp | 13 ++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/lang/gcc13-devel/Makefile b/lang/gcc13-devel/Makefile index 9a5859c15d39..2d3dfa12be7f 100644 --- a/lang/gcc13-devel/Makefile +++ b/lang/gcc13-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 13.2.1.s20240106 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc13-devel/files/patch-libsanitizer_asan_asan__linux.cpp b/lang/gcc13-devel/files/patch-libsanitizer_asan_asan__linux.cpp new file mode 100644 index 000000000000..f6c16d8730ee --- /dev/null +++ b/lang/gcc13-devel/files/patch-libsanitizer_asan_asan__linux.cpp @@ -0,0 +1,23 @@ +Since the vDSO shared librares on Linux and FreeBSD are called +differently, the initialization order check fails on FreeBSD. +This patch fixes it by ignoring [vdso] instead of linux-vdso.so. + +GCC gets the original file from the LLVM Project, so this patch should +probably be upstreamed directly to the LLVM Project rather than to GCC. + + +--- libsanitizer/asan/asan_linux.cpp.orig 2022-11-23 11:22:41 UTC ++++ libsanitizer/asan/asan_linux.cpp +@@ -148,6 +148,12 @@ static int FindFirstDSOCallback(struct dl_phdr_info *i + return 0; + # endif + ++# if SANITIZER_FREEBSD ++ // Ignore vDSO ++ if (internal_strncmp(info->dlpi_name, "[vdso]", sizeof("[vdso]") - 1) == 0) ++ return 0; ++# endif ++ + *name = info->dlpi_name; + return 1; + } diff --git a/lang/gcc13-devel/files/patch-libsanitizer_asan_asan__thread.cpp b/lang/gcc13-devel/files/patch-libsanitizer_asan_asan__thread.cpp new file mode 100644 index 000000000000..61c0ccf1cd89 --- /dev/null +++ b/lang/gcc13-devel/files/patch-libsanitizer_asan_asan__thread.cpp @@ -0,0 +1,13 @@ +--- libsanitizer/asan/asan_thread.cpp.orig 2024-01-12 13:45:52 UTC ++++ libsanitizer/asan/asan_thread.cpp +@@ -323,7 +323,9 @@ void AsanThread::ClearShadowForThreadStackAndTLS() { + if (tls_begin_ != tls_end_) { + uptr tls_begin_aligned = RoundDownTo(tls_begin_, ASAN_SHADOW_GRANULARITY); + uptr tls_end_aligned = RoundUpTo(tls_end_, ASAN_SHADOW_GRANULARITY); +- FastPoisonShadow(tls_begin_aligned, tls_end_aligned - tls_begin_aligned, 0); ++ FastPoisonShadowPartialRightRedzone(tls_begin_aligned, ++ tls_end_ - tls_begin_aligned, ++ tls_end_aligned - tls_end_, 0); + } + } +