From nobody Mon May 30 18:30:29 2022 X-Original-To: dev-commits-src-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 B35001B4C2A5; Mon, 30 May 2022 18:30:30 +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 4LBkVZ2y71z3Hl4; Mon, 30 May 2022 18:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653935430; 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=Q5ExaTG+6AYEkXu04EsHZ+Qg4HSKl06hKgfpwkEk0MM=; b=wWJ0/HnupHsblLQlv4deM6W+CF/V90a0kF1CmPLIOIap/nSS4jDDJkEzN+bwIhw6ZNU/S4 ub2XjFVte5skx8LcK6KvoBtxV/CZYDFk3jKGN0lny7yHt//waJ2g+7umj+RqB73OyFMIqg nH+JWMOYe6vySARPpfQGV2ZC1hP/pSWAz6eGS26axQUkFfPCB2yhTBrCBOuwP6vBrSYQfR Mia/W02cwYOJ/3DcNma1X8cEaUHGVeglaY8gzaeKBIuLfWp5szsXPnQDdEMrs19UtUAeew GEdYB1GWg5yfg0KeNO6tSRu5wxoNzD5wtu84jM90ZhDoZuXqnbJIzD5weZDvsw== 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 0712B1C5DB; Mon, 30 May 2022 18:30:30 +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 24UIUTuC084113; Mon, 30 May 2022 18:30:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24UIUTEM084112; Mon, 30 May 2022 18:30:29 GMT (envelope-from git) Date: Mon, 30 May 2022 18:30:29 GMT Message-Id: <202205301830.24UIUTEM084112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 84f5770003c4 - stable/13 - ASAN: reduce verbosity List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 84f5770003c4a8e62790eb0348f7e6d6bdb648a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653935430; 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=Q5ExaTG+6AYEkXu04EsHZ+Qg4HSKl06hKgfpwkEk0MM=; b=udbrZ8ERZbNTBcVRmV2TK+KSYeTVr06nNg7WOcaffa8EM8p1MtAbw2KXL9UR4r2/WY6leV 9+qU1/88B5y+ubvmWPDdkKXd3zoka2a3/ELoJP4xjmTNaG+no0NwRuHxap0Msw4zHSv5sW v/+CSZFL8gQ0RqX6liBjoxKv3v61PgXf6MTYML1c5IY1GXhvtZr2v6atA4nfWCUFR6kMo0 pOHiZmcmcy7EHhb5GasUG5qFoKFpZBa7E1JY2pVJ7qc6mPXAn6ul20E+dqWlIN9ir3Rhqi ZIo8HsmVc7lSDQzKG4yKael6wJSqfayroAggoYSyK+tbhlFVIZph0BF0eBCXlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653935430; a=rsa-sha256; cv=none; b=YPoBXngdImpbXO1eOwzS0Zm4K+JK/s4Y0p+36gelhbJfJY0Sk1vEjOaKy1soPJMDVMFLno pid8cRaVDj7wCyTBZnVnwfubSsTIj5G/s2BdFaR0VbMjbCK2FufTsmClW3TmQssBCu9yto MC/vmG6tv9RBWDdPqB2uFoCVfkFPRktQOQvMmPCrCHcnDX4H2vkmSF6eOr+z9w/cSyAMmo QsT+mip//Fni6kXPDOeKl/nyemlyl2f9L/Ytpxv9seJRPJtOdiMw8phurcO/C0jIB6aCam upmdlS10qnF5DzRGuhGP+jSsihP4UWL+agbGg/gE1odwat6HS1bFejct91yqMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=84f5770003c4a8e62790eb0348f7e6d6bdb648a4 commit 84f5770003c4a8e62790eb0348f7e6d6bdb648a4 Author: Baptiste Daroussin AuthorDate: 2022-04-25 09:23:23 +0000 Commit: Dimitry Andric CommitDate: 2022-05-30 18:27:47 +0000 ASAN: reduce verbosity When running binaries compiled with libasan in PIE and with ALSR on, the previous code always print the WARNING message, the new code only printed it if the run is made with the right verbosity Before this change, many unit test will always fail because of the extra message which is printed Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D35055 MFC after: 2 weeks (cherry picked from commit 0a736f0a6aeb0bf8b7e677fab8b562704eb4980e) --- .../compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp index 193a7fa8b1c5..12e42cf986ab 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp @@ -2204,9 +2204,9 @@ void CheckASLR() { return; } if ((aslr_status & PROC_ASLR_ACTIVE) != 0) { - Printf("This sanitizer is not compatible with enabled ASLR " - "and binaries compiled with PIE\n" - "ASLR will be disabled and the program re-executed.\n"); + 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();