From nobody Tue Jul 15 12:53:08 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 4bhJyF39g0z62N3W; Tue, 15 Jul 2025 12:53:09 +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 4bhJyF0jF3z3V1b; Tue, 15 Jul 2025 12:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752583989; 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=JYeY9CaBJP9cOSf0I04/5IVnOxHbAuJ8v6Fcs4bNr+w=; b=vRjxE82OZthp4zQ2R0x/xuzQIjn/ESqGytJClgVe3oYUzRWlyfczRJHdLu4pfO3rUYLosg d3sP+qIoy0SNixt9kiEAeCaGfX3dz2hVopUh0OxsbDyETY9e5p93OvyWj2GrDSf/Zk+7fY Cvu0Np7OjHqGHZJij1SpbnFOQEByhB/xkDhRss6tc4fJY+t9r3MvXOTDnGUfeuyJdcm2Xy FuKJi6kNEsmHm3SGmTIBWC+53xE1CuZFnT8YiwlaSk9nO4GbeQGzWeadFNUxkihz8aQR1f MQWDXi9sUb5qPG9RV6HqbR7tjw+Rn0MuVk2iRqoIhmEPu5DQqsVmZADaUuL2Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752583989; 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=JYeY9CaBJP9cOSf0I04/5IVnOxHbAuJ8v6Fcs4bNr+w=; b=IHTQ4DGwsRy1OuDbaOQWtpLul0Oc14g5cYNXgzK9KNYf0sxtTtFUezYwjF/dhIBW+nx2RH hMoc6Et3crTd+zMeis5UawbFaMDWGCfkOTYRqHxviMh9T2gB4PdAsROY4xNAU9uJsr6DrA vIj81EqWGJvuX6xjhlCVq4CWqWWp6c51JaXEya5vp0y9nDIFP/79hxKSndAVqwiv4ziN0T e8ZIa2v7YcsR/PyrS1k41vdg7bIlaVZdyrbu7ulGVx0/WQMNDwd7GhYGLcL4mWMU8w6/VW krg4Oaa5+Fislh2901Q9rvgqwTkAythPVaDQISaQnhExo1ATbTt1YJHJIXFqsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752583989; a=rsa-sha256; cv=none; b=Dzt3q4StLAvFf6ytWR1WDEdCXnfluOxUi21cNiPep2HVjghJgOA3W+x0NF7J8iySUXkE6w akmYCiJZ4ihCqZ9n1f54s4hY7H5f0PP6MLDSnG4Hxhusy+WBk/oAQmnJvv/2K0v2KmBnNR OOv2wlaKRzooV6VWvvduq2dF1C8amxKlxREvAOs9VyiTUQDgNf7Rf0HOEK3aQU4It58JoD WpqzZGRgoqvN3cfy5B4RKY+ODnYRbBzq2FbwU8JNM/JKYKk2spF2SZeAiQFdX7jC/41c/O lBAlJjw6ASu/5LHbBHtPHdAlb40K5S+80B/h/xc85bRcV2i+Ee7HursgDXSevQ== 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 4bhJyF02DyzgqR; Tue, 15 Jul 2025 12:53:09 +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 56FCr8PK045509; Tue, 15 Jul 2025 12:53:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56FCr8Pg045506; Tue, 15 Jul 2025 12:53:08 GMT (envelope-from git) Date: Tue, 15 Jul 2025 12:53:08 GMT Message-Id: <202507151253.56FCr8Pg045506@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: 1f683624df87 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 1f683624df878b2e4c0187137640bf2e6662c36f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f683624df878b2e4c0187137640bf2e6662c36f commit 1f683624df878b2e4c0187137640bf2e6662c36f Author: Mark Johnston AuthorDate: 2025-07-15 00:31:10 +0000 Commit: Mark Johnston CommitDate: 2025-07-15 12:52:58 +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 --- 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 &&