From nobody Tue Feb 10 15:10:56 2026 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 4f9Q4K1VBHz6RSkN for ; Tue, 10 Feb 2026 15:10:57 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9Q4J6tCJz43J7 for ; Tue, 10 Feb 2026 15:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770736257; 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=Ao4UQ69IHDzQ7j0Ng4DeH7UYXpOlMF7Mqo3gj7f4Ieo=; b=V9RP+ziYbYG90JgNyRVCzOB2+VE9qRpkMXRQbHJfA+uL7fAvtQyqkGMAGy5CfjJa2G8y0X blcTss1myeA5TJGN1Cu6NXUbZPRWFia9oPvkhEQ4jNAHvcZLtC99zWSC3QbHXuaMsNp37w lrq5Z98AZjDnzWMRBJdOURq/vDCctHBi7bY38TKOA7dVzMdfV9CtsDG/zZ+91pTOU2ijv1 RaCtFE5oQtD2BQFGzyw28EAwgyUxAuMa+THdV8p8cVZK137zHGB/itsAMDk0papicpf5o7 rxEk2kZ3m+qN67s/uIm94S4haX+J/8iNyzZZHu/Oug41RtdYPEhTV2AfRhMwPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770736257; a=rsa-sha256; cv=none; b=RSBIfrUCKVvwadFN1zk4dFmRYZ7LZdxunVGlY4ntad/js3iisOzHQGTO2yF7QwSEx1KqmL FON5KXyHCvpdf/oDyV+snpBHxvWIrZqY3TvFo0/6mNaWNATMbSN+0t+2nuAU0twYYJlDPl Jw4kM/HDctJIawaHDGz5pjYPeFfGbyPmyiSIKLRB+Zros3JD0AHJJvVIoofEtZu3IA7aIi xMQEcKQoc9jIv3FGE+ErDhIl9GruhFzkFCfZHjYBR1ZjU2ZhCRPvXrRc+Tpb+zFHdtsmbh 0w2b10b9L+LSm1eJtfbKhEY1yJdCCf3sCOUKbcDsEy2ImfyiriHOc48VNc5QJg== 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=1770736257; 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=Ao4UQ69IHDzQ7j0Ng4DeH7UYXpOlMF7Mqo3gj7f4Ieo=; b=sZfGit9d+IxfIm2nvvyHJBBuy53Lzggu2v9/Scp3mIoo2QhXOSU+yUOJDPRmW06eQsAQl5 Fs9m602NkO1XKTDtyPtB3YbiF0Arq6S36/z8irZV/Wlmi668yLeYo35KgewTywPZQzZDw2 BMPi5RvdFzXUJC3BxPizwWJRGlX/y5VuYbTORf0/ymdYntPhxEdoKxl5ptkaCpeHWxW28U MzRg5tBh789U8gBWzkgU1Cg0y6xxiHCMWFF9LLT12W8jUknfrSZdu7CqrQFL7YMEtU/hCM IN0erXKgiFkRw79S7P00Q1UD5yC1DJodr65ssqw5cqBKoEdFLJzeNj+SxOiTTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9Q4J5Sjpz1Mjk for ; Tue, 10 Feb 2026 15:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44429 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:10:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4c23a98ba3af - main - asan: Use memset_early() to fill shadow memory 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: 4c23a98ba3af3a00004fd7ef54e6330b4d665d55 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:10:56 +0000 Message-Id: <698b4a80.44429.ff2105c@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4c23a98ba3af3a00004fd7ef54e6330b4d665d55 commit 4c23a98ba3af3a00004fd7ef54e6330b4d665d55 Author: Mark Johnston AuthorDate: 2026-02-10 13:53:52 +0000 Commit: Mark Johnston CommitDate: 2026-02-10 15:10:39 +0000 asan: Use memset_early() to fill shadow memory __builtin_memset() calls are replaced with calls to memset(), but that can't be used before ifunc relocations are processed if the implementation is selected at boot time. Meanwhile, the sanitizer may emit calls to __asan_set_shadow_*() as soon as locore jumps into C code, before ifuncs are selected. Just unconditionally use memset_early() to work around this. Reported by: andrew MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55079 --- sys/kern/subr_asan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index fee6c1a844e2..867d232198b9 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -241,7 +241,7 @@ kasan_shadow_Nbyte_fill(const void *addr, size_t size, uint8_t code) shad = (void *)kasan_md_addr_to_shad((uintptr_t)addr); size = size >> KASAN_SHADOW_SCALE_SHIFT; - __builtin_memset(shad, code, size); + memset_early(shad, code, size); } /* @@ -1168,7 +1168,7 @@ __asan_handle_no_return(void) void __asan_set_shadow_##byte(void *, size_t); \ void __asan_set_shadow_##byte(void *addr, size_t size) \ { \ - __builtin_memset((void *)addr, 0x##byte, size); \ + memset_early((void *)addr, 0x##byte, size); \ } ASAN_SET_SHADOW(00);