From nobody Thu Jan 18 15:52:38 2024 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 4TG6hR0W61z56LHq; Thu, 18 Jan 2024 15:52:39 +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 4TG6hQ73SLz4pM6; Thu, 18 Jan 2024 15:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705593159; 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=0sTkqijgBZRoWQwnwhvEAb3EahLk4JUPBBiQjwEAmFk=; b=GODKOdTtBU6RiqtDyFS9O0g5SOP3KO1vjqwTfpumZY4ETiRj3220SfQdIrVK+g0XlVwL9d CJDZqUm/wWK0kI/8s4Rzujh6t5gLmVj157jCdD4ZjoqemV3Cp2obaE/aUyy+bNePZGOGiP cgBUY/uwJ8aUGuBWzGBLA601zY680ldfFYcRJBavP08AWHAvlo89m7jlyxhtmqQcce+QiK uDkaVbcd8/5P4DiK7mLAKJGmLG/8C3DaTs0AI74bGXcbnkG8jkK+Jr8iXwbqGg0bL9BFMG 0SwuFotpxU5ESDx8p9EBA64oRTiVJ0igxlWBTiTGGWWeVVGJM6XWZaiHhm8YIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705593159; 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=0sTkqijgBZRoWQwnwhvEAb3EahLk4JUPBBiQjwEAmFk=; b=eDUQBKs3uBAofiyoP9X3aW4ICOh5q3SDEGk5/8JF9sD9z4f7DYe8HpyozmxreqfaJvWUwp +WheBLdH5ZRjDdFMR2uWCTK0Rl7SM5gVDbMloFinQjYRsLV7HW4dGjxoREcyBRshAyZfps Da6xJ0c1StU914M1wfKbaVW2/rCqN2NxY2MoEq90xx7wyd+PCTEzIA5kUHgdV1TgUNz6wA J4130WvasE53sP8pJAjZ6/yb1gvyC80QjSQELc53L7vLTUvY1BJG7sXc2WyqxiTr7SbmNh THLfeiizYXyz7DqG9q6Vj08JyAlTidYkCFOtm+MtTCsBYXAtGLSvONckV72dGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705593159; a=rsa-sha256; cv=none; b=noZVfNJG1I38FgSTyRyucYCsmlonPFDdxO6z7Fwz40xwtDBfgmKDN0ZWOivmsEcuKRpend lzftSyGPs6osCmj0dtRy9CmHlwntHuTEP+jkTHUL2jzGHnxjvjrshnEADv3D6YHbNKrtR9 c6l/7pn03lMgi5emwMdSHaqqP3xsa1wjzaGYa0BUcXn+LFMZvFOEyNsV8cAqtLH1PDOWyh tyYRR3xDgLrjDnhTFLbYsy8R0dV/TgnqhidTfxngBm9JnNUzmK9tQplJ+7VchQe/o+BZmL GGxQJ0uREWwQfauGuGm6mZL602CaG7Ufpj70Njz8g69XUxh7zEr3Cc41d01QAA== 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 4TG6hQ6807z1CMZ; Thu, 18 Jan 2024 15:52:38 +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 40IFqcW4027028; Thu, 18 Jan 2024 15:52:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IFqcVM027025; Thu, 18 Jan 2024 15:52:38 GMT (envelope-from git) Date: Thu, 18 Jan 2024 15:52:38 GMT Message-Id: <202401181552.40IFqcVM027025@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f0f93607eea3 - stable/14 - conf: Do not set -fno-sanitize-memory-param-retval for old compilers 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f0f93607eea35925145a98fef0608343a4f1ca56 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f0f93607eea35925145a98fef0608343a4f1ca56 commit f0f93607eea35925145a98fef0608343a4f1ca56 Author: Mark Johnston AuthorDate: 2024-01-11 16:42:47 +0000 Commit: Mark Johnston CommitDate: 2024-01-18 15:52:25 +0000 conf: Do not set -fno-sanitize-memory-param-retval for old compilers The option was introduced in LLVM 16. Fixes: b6c653c97463 ("kmsan: Set -fno-sanitize-memory-param-retval for now") MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. (cherry picked from commit d682a91726d72eaf7ba8dddeb4d9ce161ab8b93a) --- sys/conf/kern.pre.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 158175eb6899..6bf647f5c3ea 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -125,8 +125,10 @@ KMSAN_ENABLED!= grep KMSAN opt_global.h || true ; echo # Disable -fno-sanitize-memory-param-retval until interceptors have been # updated to work properly with it. SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kmsan \ - -fsanitize=kernel-memory \ - -fno-sanitize-memory-param-retval + -fsanitize=kernel-memory +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 160000 +SAN_CFLAGS+= -fno-sanitize-memory-param-retval +.endif .endif KUBSAN_ENABLED!= grep KUBSAN opt_global.h || true ; echo