From nobody Mon Aug 24 16:29:52 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 4hTGbN5Vw8z6pbRR for ; Mon, 24 Aug 2026 16:29:52 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hTGbN2L8pz415P for ; Mon, 24 Aug 2026 16:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787588992; 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=7nER6Fhb6XFFB/ck0s06OL18/t5X/wYkdwtlf87kzNE=; b=wwJSsY0lOVlI8sNSU+8/XwNPSFugpvuV9tF/JbTOstcRBC+qgB6y1jimAu7jCT0ne4hNV2 Rgo8g/7DmTxIry3C+LVyNnPxbcbL9mhbSqCuxpFopwI1zq9Mhnw+4eQDLc8osaiVubV7cX IrjcR03PWWyqJXv+0j/GdLvaGWbEt4v6kl+E/nfaaJUWVSCvJTwQNIf314bNrvHlhihxK0 +3W8K4AqaWQteVr+sGB1JVtkoOHiV8uNOYXYyN2GaSAUifKVZE1vv3ie7EYpLj5RHbFlRf UJK9W5ydLeQ+T34kq/Liw77LNEtQ5+aD8Gbv6LljU8OU8sWMpO8D3qjhZ7Hn6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787588992; a=rsa-sha256; cv=none; b=UiXPZskYwg2nCzkLsESH739EDlWjummkEGXqfkipGSpA6/7HbiGhdB3kCCKxBitk5Fn4s5 i6sIK30tpSSnwjkG41R1pGj6Alsit5Z0jIEIXi37sHXzDlDOVY7v3kSgjaMJNja799/oQu o7idbZ0rI1pe07qtbhlPthBQ0jp6PSs35U2YzemTc/ifo+ANonM+TMneSHKBqCaXk9P4tH RNwEryUj3d7h5pwdavO7+9+k9Xok0yAgo+YQURbLTrGh/8qzQJH98MolApDNVpNoe69PqW IcJSfNJGdcDeRuTjESMxPcuYQ1Y44C9VItRDn4Q/aYrBvUO4XTQoKDh6wydsZw== 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=1787588992; 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=7nER6Fhb6XFFB/ck0s06OL18/t5X/wYkdwtlf87kzNE=; b=j1JNzTopoOygW6Jjj4li4h2X5QChNHm2gLI48hn3wg0wpwGnYdD1F63wr0E8SBoVwNUitx H20UL6BvvOSPJBBnfkNBXz81E5jbB6h1axaC7RZKgckyeNZfNMgFSYse0KihzBwB0JF7hD qIsTpxYOqm8bzSghh3xNLQ2jusTlcEN4S4PzAkMF8zBjY4H8xiC1AD/lDwhncIddCG/jaj +Z3ynhHAETpssQ5I/2ft9KL2Yr32jZld7+vsb6on64iV0UVrbo0NSD8ou4bu84XAzK5BtW o2VSOZFVRvkSkH/9k32usqe0OnXxD+cuqmuJJSWHYLF6Tu6m9QjP1FMo2e1N8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTGbN1HCNz1BVn for ; Mon, 24 Aug 2026 16:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21bc6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 16:29:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c75520c5ec46 - stable/15 - uma: Fix KMSAN integration with malloc zones 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: c75520c5ec46e2faa208a0d7ac5b4c864afc8c5a Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 16:29:52 +0000 Message-Id: <6a8c7180.21bc6.2b53a20@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c75520c5ec46e2faa208a0d7ac5b4c864afc8c5a commit c75520c5ec46e2faa208a0d7ac5b4c864afc8c5a Author: Mark Johnston AuthorDate: 2026-07-31 19:47:10 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 15:17:54 +0000 uma: Fix KMSAN integration with malloc zones In commit 459aa032e872 I dropped kmsan_mark() calls from malloc() on the basis that UMA and kmem_malloc() would handle updates of the KMSAN shadow map. However, I missed that UMA explicitly does not handle this. Modify UMA to only omit origin map updates for malloc zones. Fixes: 459aa032e872 ("malloc: Refactor redzone and sanitizer handling") Reviewed by: rlibby Differential Revision: https://reviews.freebsd.org/D58574 (cherry picked from commit ea7d35526878ebf82f10080795e462d007485bf1) --- sys/vm/uma_core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index a1930b1d2d8b..5e63659ec06c 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -635,8 +635,7 @@ kmsan_mark_item_uninitialized(uma_zone_t zone, void *item) size_t sz; int i; - if ((zone->uz_flags & - (UMA_ZFLAG_CACHE | UMA_ZONE_SECONDARY | UMA_ZONE_MALLOC)) != 0) { + if ((zone->uz_flags & (UMA_ZFLAG_CACHE | UMA_ZONE_SECONDARY)) != 0) { /* * Cache zones should not be instrumented by default, as UMA * does not have enough information to do so correctly. @@ -645,9 +644,6 @@ kmsan_mark_item_uninitialized(uma_zone_t zone, void *item) * * Items from secondary zones are initialized by the parent * zone and thus cannot safely be marked by UMA. - * - * malloc zones are handled directly by malloc(9) and friends, - * since they can provide more precise origin tracking. */ return; } @@ -662,7 +658,9 @@ kmsan_mark_item_uninitialized(uma_zone_t zone, void *item) sz = zone->uz_size; if ((zone->uz_flags & UMA_ZONE_PCPU) == 0) { - kmsan_orig(item, sz, KMSAN_TYPE_UMA, KMSAN_RET_ADDR); + /* malloc(9) updates the origin map itself. */ + if ((zone->uz_flags & UMA_ZONE_MALLOC) == 0) + kmsan_orig(item, sz, KMSAN_TYPE_UMA, KMSAN_RET_ADDR); kmsan_mark(item, sz, KMSAN_STATE_UNINIT); } else { pcpu_item = zpcpu_base_to_offset(item);