From nobody Thu Oct 12 10:15:30 2023 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 4S5lrg10Sfz4nhfJ; Thu, 12 Oct 2023 10:15:31 +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 4S5lrg0SmDz3V1m; Thu, 12 Oct 2023 10:15:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697105731; 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=tk0u959OLyQhslaVouKxncdqgnfNqRCF1tNA7LsPV+A=; b=A24cNfNJxKVwETNJR0ynlo8HrLw4eAa52sb3sN/zFUJgFpk4x3zt2QPGN64szJjbez49t0 IE1QdPNaDeLCGfqdcFcjDcaesKB6AMrB0dCitKrjGKyKEgtp1cvD7o8TBcJaIElknyOy9J p2QWCcO1AD2+7g+s4h+BfHQ4iHPCbD2wwQ8gh7KvYgeBnF3Iu1OGGpSE7sBEYtqNxfC8B8 9Gj6PRo1SjX4mARYrwkn2IrSHs3mGpA7Q7DtwpN3GSRArb2C6uAZGqHJClz1xiYT8aEnv6 ns9NGGGr+WJQ5u2pQ8FKzuTjoJR7cbv4OSs8arTRGDOT6JyhwkgKx5dbmymThg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697105731; a=rsa-sha256; cv=none; b=WIlWGniAoxi4zSn0v+IYW/zaMtIBX9fCyjmgI9wk1D4M3qPPNM5hl8tztGWVZkO/XMDjF+ 8DUj9RKMksfZxPLVinZydOJpDq/NCJgJg2T+cXLb/uCUPus1lbwoyPgU+/hDoybRnz6z/M q5FrpGKP9ERIO7oGVFuuC/S8ME7bKlEpJCqd3isBY6LV62XcbSINSRwXWzQ69sMcyAviQ+ 9BRhpplzbcOBTVFd1BFmkiTVlpDBvT+Y8+7k/bJNk66sAmkniek6STRwrq+iDUuKqwsENb qqdWtCy1zeqFV365nc5DOxzmJuAoY1ciXv3P4NWmHnaQFA40Dm2v0VRzNoYCDQ== 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=1697105731; 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=tk0u959OLyQhslaVouKxncdqgnfNqRCF1tNA7LsPV+A=; b=KwWohaPuWs8TET+6Ca6kq/3R9a2EUvVTxcOGlyS1ZQNuAC/5pIBOezlvqb/YAoywEWMM27 lExixvu1Lt/bsACY+hVjs649lVo6lh3uJlVBcCPWqZGjtmt6Y8ZVCAAsJcISGloPWqGYH5 MHiHCymmxC7oBQjTsoYC0EabrrkAR8o0tEkyPnvSe8vztKOnbhGLmo/Ilt3TpxQQ8pddS1 46SJOq6cXi74yqlsOYPKZAm8Q+orFvsASaPOjrCb3cOIhZ/w5JoWYKvm49ZW9TALufEp0C 6l0f7YIw1Yf+kFzR5ZinpDKkLEHq+lDYmiQws3ok66R13RpSKgW/H/KukahSnQ== 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 4S5lrf6cv2z10p2; Thu, 12 Oct 2023 10:15:30 +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 39CAFUPA073228; Thu, 12 Oct 2023 10:15:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39CAFUwV073225; Thu, 12 Oct 2023 10:15:30 GMT (envelope-from git) Date: Thu, 12 Oct 2023 10:15:30 GMT Message-Id: <202310121015.39CAFUwV073225@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: db5d0bc868be - main - kasan: Add corresponding sysctl knob for loader tunable 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db5d0bc868be669ed6588ebeccf8c02e76aabc41 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=db5d0bc868be669ed6588ebeccf8c02e76aabc41 commit db5d0bc868be669ed6588ebeccf8c02e76aabc41 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:48 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-12 10:14:48 +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 --- 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 44c96435a499..c3664d9cf6c2 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; } void @@ -180,7 +183,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; \