From nobody Mon Apr 25 13:42:16 2022 X-Original-To: dev-commits-src-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 CC9971A9C7B7; Mon, 25 Apr 2022 13:42:16 +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 4Kn5m85RNrz4rRS; Mon, 25 Apr 2022 13:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650894136; 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=W4katqtGYRzgjj6tpQctHbAuVsKPMEz4INDMmxJjqbA=; b=KSNnqR9jJaLuNqWxY5xwWLp/st49YIenkTbmcivnFbQMNiEpQd5G9W5BTqKyUznHUf3PgH gN60667QlYMQfW+FFGQfd3BnmWgq+gL0ua4Bz05Fp9HOZ3DLd9tvGzOR9fbAgeY7PxMA6d HwQlizeVWlIrG8erQJfR9vMKMIKfIbEAX7OrRkXKfEERs5GiC1aTuMXURfxuy3mYubv+I9 Yb5r8emEf1wa80IcBx23Qiuzit2UVe8mXuKNv1yr9dNiciTPnZ7yRxuEYsqFl0yZBc/pjy NPmD+QG/JKcAfSmXfKus5A+hpv3g9UOfKfY8po0bAkI6IGcukBaE8P6US5WnKQ== 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 9AF361BE2B; Mon, 25 Apr 2022 13:42:16 +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 23PDgGk3078121; Mon, 25 Apr 2022 13:42:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23PDgGfN078120; Mon, 25 Apr 2022 13:42:16 GMT (envelope-from git) Date: Mon, 25 Apr 2022 13:42:16 GMT Message-Id: <202204251342.23PDgGfN078120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0a736f0a6aeb - main - ASAN: reduce verbosity List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a736f0a6aeb0bf8b7e677fab8b562704eb4980e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650894136; 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=W4katqtGYRzgjj6tpQctHbAuVsKPMEz4INDMmxJjqbA=; b=XBKGxNKQb87wisMElOy2iq7BeOO8wSuqF51Vac0+IngScpQk3g4IpBxNlERQ2j5LGUEJa/ 0IBQIe1dZrcKBvfLkOLP+XICGnFMZVkuiQXwX1jYlZc+JBVKQBYuw/QfXUWS0HvEzzAxxE On+QG3GTgbcMLLtn3Ty+IZ8MNieQDscBE6B1E1oRsCiwG7W/Dk/KB8a3trnZUFgmqd4bj9 bZDN/plH9al6cdFBeOwOjW0XtP3kVhiSkDpAFiXBlwUXZK+B3HKr4W5epQKXGbJtHi/e+u hMAu2jitvvIntncqObfoOKlfYyMJMMa8y4wN0txFpqQ5gz1tRsg4JGb+ZR25uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650894136; a=rsa-sha256; cv=none; b=J3jkPdYxdhxg8rnLAVw8J+aFc3xxKU6KE6k8Snnybd7ENehCtdXRV0xtLVp6sQi3Al+SR1 dHkbaCvEmkrJ6jXJLe+xJp0hbeO2V2hazM6ZC2buRQy754NhDakc9DDH++zBKNEljGMJQL 5g+NLGQjvVKMQPzwyZftJC8aYc5dGKPyt/K+pYCVtf2ub5yUQyTla81nKt2hbuZZasGlOI giv2wnwbxnPPaT4jjorNcuFLeai0S7LwenLTwQqCbk4UV0qf/6rPA7WjM/VEXJj7PQQ1jb J85jxhcqQrHbudhTBQJvWO9ZUsn+c62CTcpWBnYbiDplc3y48Rz4bjzMuNxzng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0a736f0a6aeb0bf8b7e677fab8b562704eb4980e commit 0a736f0a6aeb0bf8b7e677fab8b562704eb4980e Author: Baptiste Daroussin AuthorDate: 2022-04-25 09:23:23 +0000 Commit: Baptiste Daroussin CommitDate: 2022-04-25 13:41:32 +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 --- .../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 769e8029dfcb..d2dcba6d654a 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 @@ -2208,9 +2208,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();