From nobody Thu Oct 19 14:19:32 2023 X-Original-To: dev-commits-src-branches@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 4SB8x03Gssz4xVHQ; Thu, 19 Oct 2023 14:19:32 +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 4SB8x02K2wz4Twp; Thu, 19 Oct 2023 14:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725172; 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=xKtblULYOSTB8e/1tf52Hti3WCYShLJQQkvIG4akkNs=; b=C7Li1yudK04Uh+YHxbNAmF8hHqm2eE8dm/5HYBrn5tq5WpYFiLtq0w3G6Qb/PCsWYckzin J3wFONocrOgABV2onJHyyHpUGw+AEzZhcH5RVGJM0p2bYt+0s7yDvTiGXYr4MGb5JcE6lG Ba9yxrXgVwsPDwHCA/TsJpqriWoXxgHeje/S16K6noIeVOsXX2dnKR8Qn50Knsndd1CxJ1 duw8MoN7U7qyW6XmA8jS8FEoyh18gIooIn5wqLO4x0BdW0DsJaTo4cCV8Ke6hIo6vFJUa0 Zc+EtjEpBQR3dO9qt/BgO9ejqP4Uoi/aGbNrYloXrVwsxO8VyIQu4CZUxrepEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697725172; a=rsa-sha256; cv=none; b=q5MZaSwNjqgbZAz7QRnAeLbOD4oVjUM2FFt+9UprboXqloeIMOaNv8SE0w36CbE6cXIM+D CHVWm/54SZVUU/H/KXrdlFK3cMmBh08AmJGL+IpC0P2Zhc2zINlfnxJrL9S35pkCLpXfRd meczEzUfPXCWdHg8T9qGaOX9TCi50hFsW5SK+U3ZyukdDYkUK/ErjgjLSv7cedszbjtdBD 3HB2eC3FwZcMtt5UJjNYiTeAyIKi0YxoGSX0yANestjmFxCLydrImMsa5FpJh7VYfSyZ+N IP5/UzAxrdSAt/6KGOaGCeNcNrKnL4U5KSffUETsvD0HIbUrcmzA1L6mIiiCnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725172; 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=xKtblULYOSTB8e/1tf52Hti3WCYShLJQQkvIG4akkNs=; b=t6+4qIKE/qfk+l6c0sf58niYJo6/7IPhuzN7dGMwnN1Zak83x3GLIeEcmpdC9iXRbrcdol Bvs3sTBARPaU8JupI70rSPiDgGQoja6i7UGEFIzecYQifvjq7T7R3rOlU3xVDUvOo+9fvP W/mZ5yvXwygS1EXFbBvMTtjb8X5+kPib5sK5X4ZnABH9VlEkShz7D1ntloPsTowr5/Ebz+ 4gdJ2hTTMQol1MPN6uxih9KEgI5LbISK8BqYPChA1ZLH9I97npr0XEOZDuRw1txuETi4lA spS7OZOr6MHgkliHgS50NJx0lhC1NT2SRNNfH2hyyFbMxJl3hDNVEHxJxJqb8g== 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 4SB8x01NNjzsxd; Thu, 19 Oct 2023 14:19:32 +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 39JEJWCp062258; Thu, 19 Oct 2023 14:19:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JEJWvK062255; Thu, 19 Oct 2023 14:19:32 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:19:32 GMT Message-Id: <202310191419.39JEJWvK062255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: c2be2c87dc21 - stable/13 - kasan: Add corresponding sysctl knob for loader tunable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c2be2c87dc2100b107a20ddd918ed9d74b8533e3 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c2be2c87dc2100b107a20ddd918ed9d74b8533e3 commit c2be2c87dc2100b107a20ddd918ed9d74b8533e3 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:48 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 14:17:29 +0000 kasan: Add corresponding sysctl knob for loader tunable The loader tunable 'debug.kasan.disabled' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit db5d0bc868be669ed6588ebeccf8c02e76aabc41) (cherry picked from commit 6f8ef4d6e44ee27a08c14ab6a892ffccf332bcf7) --- sys/kern/subr_asan.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index 1b8c52c0eb8d..9c33d0187a6d 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -92,7 +92,10 @@ SYSCTL_INT(_debug_kasan, OID_AUTO, panic_on_violation, CTLFLAG_RDTUN, &panic_on_violation, 0, "Panic if an invalid access is detected"); -static bool kasan_enabled __read_mostly = false; +#define kasan_enabled (!kasan_disabled) +static bool kasan_disabled __read_mostly = true; +SYSCTL_BOOL(_debug_kasan, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &kasan_disabled, 0, "KASAN is disabled"); /* -------------------------------------------------------------------------- */ @@ -136,7 +139,7 @@ kasan_init(void) kasan_md_init(); /* Now officially enabled. */ - kasan_enabled = true; + kasan_disabled = false; } static inline const char * @@ -174,7 +177,7 @@ kasan_code_name(uint8_t code) #define REPORT(f, ...) do { \ if (panic_on_violation) { \ - kasan_enabled = false; \ + kasan_disabled = true; \ panic(f, __VA_ARGS__); \ } else { \ struct stack st; \