From nobody Sat Jan 13 08:18:51 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 4TBrs81bv3z574dy; Sat, 13 Jan 2024 08:18:52 +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 4TBrs75hhlz4f1l; Sat, 13 Jan 2024 08:18:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705133931; 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=sppnAksCnyJjbFFaB+QrK/QhnXp4ogmC143ZqRL3BIA=; b=oPTsGwnE1utDGFpeJ42ZO5B8KT8oUfeIz5p4dvEmzhmzwkJjCfGDu5JuxoqRi9HDN6wVl6 1oXCP89YBRrjtD6gqvnnnwKH6dCdiUwY9Ljl2H8AYPIN88CRVKRInHl/B9yrcBA4L5zvTS o6itRUIE9e62WmbKkggViSSdTWv0+UzPqnAt50ek/0bkS30n6DEgt563FfjrzkvK89njPo IQV7huxX68M63AnuboJJVh1iH6qLBh+JYIKSFjILJXQyzCFrMzn3mfd1xwdObLG+JBK/dC fw4LSDiMyNYGn+xqnTo+Gk1DzMqt6G2Wyq5qYNRdh2n4ps1R7gVxnNbz6jDa/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705133931; 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=sppnAksCnyJjbFFaB+QrK/QhnXp4ogmC143ZqRL3BIA=; b=H6G9lSwevVur1W+62hIWvW9R9zu90XJH7KUKdZZhE1Yr9bcAsD+psnTSVQNlNkT9SydpBW 2YXGa40rsaq9RE9CMOObKfAVz1ExJp6NnJEi9idvTdUGUz+1mOH0QuZF0b8vuGdr7kveeV PUqRWmQfAhYLJK9Qp2gt/pCkVS4K85oDVfwO3s8H9MJ752R1/m+GYalgg6BgBXqPp+DzaY /fd+p6z9+mjHx3GXvs04IDlUcGK2ZZ0wx6JW1eLxMKi0C1njtYD/CFRTyoOGv3rret7FJb M1AjidjMBHiqqJKo275jtIENwaEEBc8fS9mipafJXuI6Bk4IfasiLASvphnAdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705133931; a=rsa-sha256; cv=none; b=qq0cCbsbdqzAyrnLz9zUwNTR57AmQgFGoRBl+DFGCvjitM2M1pcM0+xMr+P6fzUQcfmcdI p9D0rMogQRCHs9SFSxA0r4OLHxdsMFHBbzDqMrAAoDPpjbPTHAd0D8Zwo9sIrO6MXw8896 yK0R/5CwbaOWZscMpNYYjDqsaSxZFyQ4vh/QOMn7lxyKE1QYwxjd/tr+QBpuDzxv2H5J6P 2P9llcduMd09yIWIqg0VfJY+6PesfUux9UFMOrK1wHCX27UN+5pSPnPxh9me3DQmWWZwyi O9L2tg0AB3H/Ee0QsAi54/dscirGTf8WfeR67LSiULYA0ecdgjUccy8oYEGF1w== 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 4TBrs74p2MzN5W; Sat, 13 Jan 2024 08:18:51 +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 40D8Ipja050965; Sat, 13 Jan 2024 08:18:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40D8Ip76050962; Sat, 13 Jan 2024 08:18:51 GMT (envelope-from git) Date: Sat, 13 Jan 2024 08:18:51 GMT Message-Id: <202401130818.40D8Ip76050962@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: 11e18f525a83 - main - lang/gcc13: 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: 11e18f525a8390fda31c44838bde003e23176b95 Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=11e18f525a8390fda31c44838bde003e23176b95 commit 11e18f525a8390fda31c44838bde003e23176b95 Author: Lorenzo Salvadore AuthorDate: 2024-01-12 14:34:58 +0000 Commit: Lorenzo Salvadore CommitDate: 2024-01-13 08:18:34 +0000 lang/gcc13: 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/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/Makefile b/lang/gcc13/Makefile index fb314ff3629e..11b37e3c46b8 100644 --- a/lang/gcc13/Makefile +++ b/lang/gcc13/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 13.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= GCC PKGNAMESUFFIX= ${SUFFIX} diff --git a/lang/gcc13/files/patch-libsanitizer_asan_asan__linux.cpp b/lang/gcc13/files/patch-libsanitizer_asan_asan__linux.cpp new file mode 100644 index 000000000000..f6c16d8730ee --- /dev/null +++ b/lang/gcc13/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/files/patch-libsanitizer_asan_asan__thread.cpp b/lang/gcc13/files/patch-libsanitizer_asan_asan__thread.cpp new file mode 100644 index 000000000000..61c0ccf1cd89 --- /dev/null +++ b/lang/gcc13/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); + } + } +