From nobody Tue Jul 29 12:49:16 2025 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 4brwCJ72M4z62xR3; Tue, 29 Jul 2025 12:49:16 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brwCJ2Vchz3lLZ; Tue, 29 Jul 2025 12:49:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753793356; 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=30XXBRxxGEVv6lcX1Cj0EnTQf9Fkbrfc06BORyO4mWU=; b=BTg9LW/p/1hl1ljt6yNAk8FWN7pYlWKmk9iPkcj9OmSi2V8yEQ0XKRPAEakBBDZ7F74Hp7 w7RVaYtGLltA84APceN45Y5LYG1KKZofxQZD9uSMC+j48MmwtIQBifmmdQh50miss/FLBS geb8SqCpx8OR1mvUJsfHUO82eOxdUQdAn4j/N3tA3GdD92FWRXvrumgw/Jct1iSegVWfrF kw+qYc4tpitIV6ad1mkC5cQ4oMThdpy7mYJQpgwytUugJ7k26XSiqBzoceoCUfA61fVdId /buoIgldj13uSdXA7RSdpHTMNJruXLJL6T4ZlxImqPqrpijA6RBQMoFCjQivTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753793356; 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=30XXBRxxGEVv6lcX1Cj0EnTQf9Fkbrfc06BORyO4mWU=; b=rEpXVrq59HOOCoYZldzDjw+qS9R35XPDCYqvwYBHBSC4Ee+cJEkBAfxdTqfHCtW5w03fPD JLdy2o6F2noL/5EE+Sv1q3c0ucU/9BkGhpR1KnjnQ6z033rmQp3PJYAO30WT+u6XIbPQVi +MGAlr4O9re2iqx4a/qJMyBQYN+ish6msT8QbnMszQRGnGyGsIQJS9lP1FELBDDuW3zEAi D9Eg7dz+W/V28s/CovemSTKju2sU9oQ2ut1u6IgWszXbujfQwbItGX/zRFyx2c4CaNR20x B70FxHRT1vz/B168NbOq1Wb6RzckU5WTOa2V82q+IxJAauAlLC5fL7hk2Hvsxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753793356; a=rsa-sha256; cv=none; b=gFIoa+xNRw99rvvtoGqCZGlaYkydk960ghSrCFACr9IKsXvAnyBmu/O+XBMd0Wdk7L6tVY y6uokDQWKMUUCSTybrVcGiW1C0TqMtOb7YpUMn1lJIA/v353lb7rstPHct4N8twA6q4zh0 GBU7O3oG6Acwn9sjtkJxISlEUGlot7Vv0Ek/8aBNlIK2Ln67ww8XeelA8pmHha8ssg/B1u 831q2Fu6YITvyPUS3Zb9RYXUZTyof2BlqHrafFlbShfiWYF4dH/ow6w8i9758L6eyMEgj6 9JnPvu04uLXs6LdoDdgRyn6Ox9OanL60S5d6tIfuSr06uE8xSLS3GpWaJCfDXw== 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 4brwCJ26CgzY1n; Tue, 29 Jul 2025 12:49:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56TCnG9p033737; Tue, 29 Jul 2025 12:49:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56TCnG06033734; Tue, 29 Jul 2025 12:49:16 GMT (envelope-from git) Date: Tue, 29 Jul 2025 12:49:16 GMT Message-Id: <202507291249.56TCnG06033734@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: 1392b97d0388 - stable/14 - kasan: Use kasan_md_unsupported() to check for invalid addresses 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1392b97d03883e53cf2b92c6c896a9a1ce6f4f04 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1392b97d03883e53cf2b92c6c896a9a1ce6f4f04 commit 1392b97d03883e53cf2b92c6c896a9a1ce6f4f04 Author: Mark Johnston AuthorDate: 2025-07-15 00:31:10 +0000 Commit: Mark Johnston CommitDate: 2025-07-29 12:08:46 +0000 kasan: Use kasan_md_unsupported() to check for invalid addresses The subsequent assert verifies that the address is in the kernel map anyway, and this removes uses of the MD DMAP_*_ADDRESS constants from MI code. This fixes the amd64 KASAN build after commit 4dd828c80828 ("amd64: add kva_layout"). MFC after: 2 weeks (cherry picked from commit 1f683624df878b2e4c0187137640bf2e6662c36f) --- sys/kern/subr_asan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index 0edb631d1475..464efda1e91a 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -263,8 +263,7 @@ kasan_mark(const void *addr, size_t size, size_t redzsize, uint8_t code) if (__predict_false(!kasan_enabled)) return; - if ((vm_offset_t)addr >= DMAP_MIN_ADDRESS && - (vm_offset_t)addr < DMAP_MAX_ADDRESS) + if (kasan_md_unsupported((vm_offset_t)addr)) return; KASSERT((vm_offset_t)addr >= VM_MIN_KERNEL_ADDRESS &&