From nobody Thu Jan 11 19:20:47 2024 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 4T9vdq29Sgz56lnM; Thu, 11 Jan 2024 19:20:47 +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 4T9vdq1jmsz43N6; Thu, 11 Jan 2024 19:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705000847; 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=D6MAztWd3v1pI4V3L35TDFK/dwfhfJgmiiFeDJhVvyQ=; b=szu5G7KKFbp96NFJs2cWJOZVkl4vE0Yq2oeOZnsfqskEtg8x9fQPFGV+0mN81tnDQMgPGH ca17Xlq18PM8oty4PdCY44m3gPjTTXdzFvLcm3LjhhrAyqOyTecFnXxGexaGc6eNthB/9o u1ljL7lIJBQ5No7ZCkZf+GZXmRTELJECs9AazZp01sY3SHqM3iWsir4h3HZqxwFM7a5S7d 8hlLszh6f2cS0bCizJuh6SDBgyItaDXroKzuvc8yVgg316rWl8Db3nqV6uL8AGjknDoAJc ZHud9I/yz65ZiF1g+1zfgVq2XgnltwfN2RkqQGtoAwZ43gOjaBlxld72dUYmCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705000847; 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=D6MAztWd3v1pI4V3L35TDFK/dwfhfJgmiiFeDJhVvyQ=; b=WYnCif0Zin9cO2+GcbFLpyrqJIahWbmbQvLfrJBURbWIjCc0PTmNuudepUBPTQf6f0q5Ep 5/cYs6S2rgWbkXSXt75TksVhB1+1MuRN2jAzH9MMk82LYWAIS5xRYW3I6w9mRaRIsraCYL op0ultXCJWsXljfggKOrjXT1ovwwprEJHAYwf0GhNopFpTTBdT0StvS4WAyoRAnR0xyqgL oWsmhm0kf6XxTVWoozJ/djU/C+hXiyewIwmsgVzFyrVvIgC4xwJwMLY/Oc/O7v9sAb6ru/ 5NPTyJ812TJ58dWjBH8u9fUJ0NGNuU5Jy2tvMoNvxHzd20IOkDBtmhFzPRvtVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705000847; a=rsa-sha256; cv=none; b=djgHFwMMAx3CWd/B2z77LBDaiGXH3I7eN9p32icTmWlgK6etIloGtCthgbDXJ2OlwzT+uE L+VPAmdP6xd5qdOD7gTS76guhFEaW6/YZsdnEhgPk55IPvGx6ij9bkBNiU5CZQF46CCKpP jFG7tarL2UFUIp6zg6OMxibgSoyTxgbuMA742BqXHm8+n2TDZhxvm47iNauCstQrZGedEj iM/UVOxlKN7VqaiXj3y+B2A0exajFQI37WLn6bdqxcq3TQx1CQNQUrVGiL3eB69nyTWVZu ca9UdRy9kaVuVXCXGLE7Mmsd9mdlozqeTFwXiKg3bghWtgzvF5mov2p9LCtsNA== 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 4T9vdq0qDLzWxB; Thu, 11 Jan 2024 19:20:47 +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 40BJKlVP011972; Thu, 11 Jan 2024 19:20:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BJKl8X011969; Thu, 11 Jan 2024 19:20:47 GMT (envelope-from git) Date: Thu, 11 Jan 2024 19:20:47 GMT Message-Id: <202401111920.40BJKl8X011969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d682a91726d7 - main - conf: Do not set -fno-sanitize-memory-param-retval for old compilers 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d682a91726d72eaf7ba8dddeb4d9ce161ab8b93a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d682a91726d72eaf7ba8dddeb4d9ce161ab8b93a commit d682a91726d72eaf7ba8dddeb4d9ce161ab8b93a Author: Mark Johnston AuthorDate: 2024-01-11 16:42:47 +0000 Commit: Mark Johnston CommitDate: 2024-01-11 19:20:22 +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. --- 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