From nobody Wed Nov 2 17:03:07 2022 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 4N2Y9l5yRjz4gP32; Wed, 2 Nov 2022 17:03:07 +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 4N2Y9l5XgGz3pwf; Wed, 2 Nov 2022 17:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667408587; 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=ZpPvnZOVaW7/dLazaVL1+iYPvyzivBjt8rdr7dVZ7Jk=; b=csV+p7RgTKvKekvwY5gqhZdNY01BXU+LhM3DBdZFwrBvqTLj4bfS0K0ghZWAHgl8zvibjr iPcOTnNmaYx5FdSiLmB4gStafPnPeLqEC/JE+vPLli2V5jC8Fu9B56Oe08IofWphk2Yg2X iOV9HqpXV5t+bwGIvtgwPIURKCRZkiW1fWVZL5MU89S5WgPXAXvknFyZ7ps65w0hI+upaT OgiHHtrKTMpUpnFE3npP0TE9Mr4piiuI9FazpKOn/s0/LvdbjE/zQLjuqXinv81ZC1YGCO O1OzGpSsR/RB6bpRVByVso0Mtu969DtTnkdcFIB+u0x+yC0ron1QUn5W6YbUzw== 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 4N2Y9l4fB0z13wY; Wed, 2 Nov 2022 17:03:07 +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 2A2H37cE064981; Wed, 2 Nov 2022 17:03:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A2H37Ks064980; Wed, 2 Nov 2022 17:03:07 GMT (envelope-from git) Date: Wed, 2 Nov 2022 17:03:07 GMT Message-Id: <202211021703.2A2H37Ks064980@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 9b6930c6eadb - stable/13 - kasan: disable kasan_mark() after a violation 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9b6930c6eadb74c0261e257d6543d9f640188733 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667408587; 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=ZpPvnZOVaW7/dLazaVL1+iYPvyzivBjt8rdr7dVZ7Jk=; b=JB/MbCHT1gtqDdf5aLITdRoL1br2cI7N0uP3DXrP4uQLT972F4rzRZhIH/vSgaAVxQyTmu vqJgPesxjJWaZ4ESS3Heznyf+A1J1R7RQ4HCV8XtRmDLVTVC9p0We5KMfvWLVsOnzGSWxa Ks6AsTywahHyILo3eB0gWfGBBAj1xZBy4STkDzgm4TWDwtB22+vLoBsuCVNFM0CIQ2Vf8a 2Tl0ugmkkJ1xZNuFatxt0bZAgYnJzz6YY8e0FlJjrNAgGwzPe47vauZVUFujkJt9q9slcg akUGJfDw1wd4ISJUhclURGWUZaz7UR00HLx3r35an4WPRLBK99bocGZGQ/JLvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667408587; a=rsa-sha256; cv=none; b=AAoYy8iRuq7I71PnP5qNgUcBS+sO7v2osGHeSYkSTOV6z/vmzeTXjUOYzl/IESodS4Clk0 cpm26GWPZZgYGVvF0HT6wxWqZ3VrTbbf5cfFGbtzZic+3SUURb1/aXrxgTT3Cz5N/12lG/ /OCEx8kYXXJMHUKZZAEW7xJOO0z+k/xhwXLuFLZaEUx4gffCwts9LVDSrXEMjCuojLTrDb n4/LUlkhGi9vECCfFMH4niEtht20d64hmWkeY8utQ8ySqZM8Ga8KBPY9wuQhu6kyVDp3Hd fldI6uU3C1TmaFw/Ozj/XpS1nZAV8xLbVPegUsxH9Ye0+nEpcpMFrvxdAdIhnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9b6930c6eadb74c0261e257d6543d9f640188733 commit 9b6930c6eadb74c0261e257d6543d9f640188733 Author: Mitchell Horne AuthorDate: 2022-09-27 16:01:02 +0000 Commit: Kyle Evans CommitDate: 2022-11-02 17:02:24 +0000 kasan: disable kasan_mark() after a violation Specifically, when we receive a violation and we're configured to panic, kasan_enabled gets unset before we descend into panic(). At this point, there's no longer any reason to allow marking as kasan_shadow_check() is disabled -- we have some inherent risk of faulting or panicking if the system's in a bad enough state with no benefit. Reviewed by: markj Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. (cherry picked from commit f2963b530e17c5eff66bc5f4860b1cd224d3d033) --- sys/kern/subr_asan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index 70f7e11ef8f6..bdb7fc3da368 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -251,6 +251,9 @@ kasan_mark(const void *addr, size_t size, size_t redzsize, uint8_t code) size_t i, n, redz; int8_t *shad; + if (__predict_false(!kasan_enabled)) + return; + if ((vm_offset_t)addr >= DMAP_MIN_ADDRESS && (vm_offset_t)addr < DMAP_MAX_ADDRESS) return;