From nobody Fri Aug 7 01:48:12 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 4hGRqw48dZz6ndrk for ; Fri, 07 Aug 2026 01:48:12 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGRqw1GKJz3pS3 for ; Fri, 07 Aug 2026 01:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786067292; 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=z02lVi9iseoNeTTRbZzpxfcyeZtKN+nBcPNg/AC3jvo=; b=cYmIUVDCeaVd0/aEWwxYUNDQsnX58JMWCXXhlgphe+jDMRaF7e4zTm30XxASYFaUjnD9f8 2vXQd/nNzbqYYlXC/Bx3gTTMrQyGMzxNEY+OpUvLRxPMA9PIScQ/ziGTXu+omXeMV/OA49 UzFldSqYA2blhVBsChjYPx/iG/x45vFE0CAlmtAd+obQYAyo2uKq3n5+hOQMzQJNgiydwC NTQIFII7zOXMH/Zmw6flDEdNOQAwE/DpJl0TgW3giDHmJrPTN7Oo1sre3QVXXcfPI5Tm// na0nTOqyBpwcbHVNGJazPqMrJLv2OmL0aMx8asGno2ik8B+3DAKWKRH0Sgq0SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786067292; a=rsa-sha256; cv=none; b=bKRpVFs2UmZoGaAspDu1e8+hUaTm231aUyFUrEgwT8BBUe0CVgsxM1iGDbAlVwC66rxOPu KCityFhYgXIZwR3AoC3YzLaJgnuOffzzRqAM6HypN2dcg9ggnLWpgN+oTGdJ1PjxrF0McX HwYidjqwJguFyZHizJXEWL7N9sZ/LJPwASbiFLTNvDTIvKiKk9tlf4Xm9+adGM3FXtDsWd //rL16UbLlGsU3dOc+GfhmVuOtPROJlQyW/aSuJA+tdXrCxoJCDev/sAYgLlYwNZA8N+f1 dKp2OTMDZuULgU2f0hjXUeKAeDsEQwiFAaTQTCGmQoX5EWJUVQHXPyvfkgvHrQ== 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=1786067292; 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=z02lVi9iseoNeTTRbZzpxfcyeZtKN+nBcPNg/AC3jvo=; b=NjN7T1YuVlb4LqbzDdOTMf/0DngRWLHi2ghYaVaHuRzBXQYouLbJeAwpOkj5DGeVnhT0xP fQ1aHrBCXhNb8z/pZgIlVaB3iLINaANYg0LOfc58NIIO/bysqRx4M9dAxqNFQNBz+kNQv1 kTPH+g9zpJlX0DnRCQIFKYNlHpvyD4iV5qy/jvMjvSXESy5i6QLMaHXHd8vuEmn/j1ejE2 ELFes5KQK1wg3IrzlDsz9XPeZJVif8N5VQwj5q0QDdvfOkut3pMwYwnnsBdKJZc0j/Yp0V 3oOleJjwdZlIxhw9Jl8fNqm9saCkSVZ2ZQuEV95Vaxsg8NXDu+ICW+1T/ki1UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGRqw0CH0zn4k for ; Fri, 07 Aug 2026 01:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be0b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 07 Aug 2026 01:48:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: f58af5d9c538 - stable/15 - kern: osd: trash a slot's methods upon deregistration 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f58af5d9c538130d5bcdfabe1d94b56f32aa6fff Auto-Submitted: auto-generated Date: Fri, 07 Aug 2026 01:48:12 +0000 Message-Id: <6a75395c.3be0b.6ff622d8@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f58af5d9c538130d5bcdfabe1d94b56f32aa6fff commit f58af5d9c538130d5bcdfabe1d94b56f32aa6fff Author: Kyle Evans AuthorDate: 2026-06-25 03:08:05 +0000 Commit: Kyle Evans CommitDate: 2026-08-06 23:36:03 +0000 kern: osd: trash a slot's methods upon deregistration This both lets us quickly identify a slot that's been deallocated while debugging, and forces us to take a fault if something tries to call one of the methods anyways somehow with osd_destructors[slot - 1] == NULL. Reviewed by: imp, jamie (cherry picked from commit 4ffa7e126ed0081b804bda6fb71a60acf49dabda) --- sys/kern/kern_osd.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/kern/kern_osd.c b/sys/kern/kern_osd.c index b64735e7f93a..94377b39dbc1 100644 --- a/sys/kern/kern_osd.c +++ b/sys/kern/kern_osd.c @@ -180,6 +180,18 @@ osd_deregister(u_int type, u_int slot) osdm[type].osd_destructors[slot - 1] = NULL; OSD_DEBUG("Slot deregistration (type=%u, slot=%u).", type, slot); +#ifdef INVARIANTS + /* + * We trash the slot's osd_methods upon deregistration so that we take + * a fault if something calls them, rather than potentially + * inadvertently executing some arbitrary function if another module's + * been mapped over the one that deregistered. + */ + for (u_int method = 0; method < osdm[type].osd_nmethods; method++) { + OSD_METHOD(osdm[type], slot, method) = (void *)0xdeadc0de; + } +#endif + rm_wunlock(&osdm[type].osd_object_lock); sx_xunlock(&osdm[type].osd_module_lock); }