From nobody Mon Dec 15 14:16:15 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 4dVMYX2Xd3z6KmTv for ; Mon, 15 Dec 2025 14:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVMYX088Rz3MDY for ; Mon, 15 Dec 2025 14:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765808176; 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=ykgrqs1Nm0qRz+nPUwibsYT2ccf6pZuoI1kcIAUHd3U=; b=fOPcjKQfqO6KyuI2pGiaLIoolnsrUH0NUTJP+fTIEsM7TBc8j6STFamN3xhezG+iekesCd 7LWen28vOywt3MSzxtO1gnPWRdgCj/PE+ykfyNnvoFPv3YA8mF+eCS0V3RuQqGgS3eSUea H2zWxkAMe8oakzrvI/xTln3ew8ShyHiZH7PP1/hTQazpDyr2QccQLjIXUqACgxtUbZbahk 9+8Fh07sTmwi3rr+LTlNDf26tPnyP/zUMV6pZlKhfr3F7aJycvbk7rcueqWmBUQervlnjO hbsa7FSXyfWkuDXapK2ImT3MnnZZkfxAbrVgGnQwTAryEyVHQ8Yka573fiQDtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765808176; 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=ykgrqs1Nm0qRz+nPUwibsYT2ccf6pZuoI1kcIAUHd3U=; b=PeBN/H2GTd/Me3l6IigayCg93mgR6V5sAGtRyzXCjr2Hsaa5KMZGQ8OaAlrq5Yhbg4+1C8 GeyTK5R71F6rDVOz7w8wUN2tzgl7beYHEFoOxIpbbDwoyGmdvnA/11JaKCQlqYhh2CmWD0 B51vVVbto5BD6UnFogkq3LAnJuvazophBmv3a7al8BN8xoro8X0SJSvnEedszIbqr0UAAI kzoSgNJ7YXRGNs+XBaMuwddAwnEbtzeFt3DL9csMI/oeRAkIzh/sY6U14+IV637k7KeUGO Tr0rnDKyJcxG7Qc4GzMUshQnsHeJ//fJ2XkXw7MN6XBUmtpt2mOSO+6hRysuEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765808176; a=rsa-sha256; cv=none; b=Xf/sFkRwYAa/ci5hiz2VyzwTXeRrT9xiyLU6F4gpSpFB5rp5N+LwDluV4S3KapJsBIBA/B fGvspwhUzunbobQuVHNfb1D7b4N4YFBiKGy1I8lG+YEe74C1Ullkp3BXRO4Q65+R3wJIeh LpI6wNSznGwS8d9x2UqIKyvF5cx0uP3i8nRMrB0BhFUQSX9vZon3HliOyRKqni/AaQxQ/n AA/ZhhVbT4zhrndHBW1KTkphlyuqotd4ulEGtCt/iDS4LeQIsJKdqfnLPPixVCvGXd6voI Y71z3QEUTglgfH0BF8DonMIqA6eb5LFxWzcB6jjMpXGpqFhL+QvIXUdQ03Xrzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVMYW6sBkz7X0 for ; Mon, 15 Dec 2025 14:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3572c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 14:16:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f7cd3d5368ca - stable/15 - linker: Avoid invoking eventhandlers on incompletely loaded files 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/15 X-Git-Reftype: branch X-Git-Commit: f7cd3d5368ca263a400b6da8eec032cb418a6a2b Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 14:16:15 +0000 Message-Id: <6940182f.3572c.203dc47c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f7cd3d5368ca263a400b6da8eec032cb418a6a2b commit f7cd3d5368ca263a400b6da8eec032cb418a6a2b Author: Mark Johnston AuthorDate: 2025-11-26 18:15:48 +0000 Commit: Mark Johnston CommitDate: 2025-12-15 14:10:05 +0000 linker: Avoid invoking eventhandlers on incompletely loaded files We do not invoke the kld_load eventhandler until after the file is fully linked, so don't invoke the kld_unload_try or kld_unload event handlers unless the file is fully linked either. In my case, the dtrace SDT kld_unload_try handler was running before relocations were processed against the file, and that caused problems when sdt_kld_unload_probes() accesses elements of a linker set. Move the kld_unload handler invocation earlier, to after sysuninits have been run. This is a bit more consistent with the kld_load handler. PR: 291238 Reviewed by: imp, emaste, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53938 (cherry picked from commit 72b114169bd56ec157d746a2df87b3a4617065b3) --- sys/kern/kern_linker.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index d566bc01bc5e..5672f80b39d8 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -703,9 +703,11 @@ linker_file_unload(linker_file_t file, int flags) /* Give eventhandlers a chance to prevent the unload. */ error = 0; - EVENTHANDLER_INVOKE(kld_unload_try, file, &error); - if (error != 0) - return (EBUSY); + if ((file->flags & LINKER_FILE_LINKED) != 0) { + EVENTHANDLER_INVOKE(kld_unload_try, file, &error); + if (error != 0) + return (EBUSY); + } KLD_DPF(FILE, ("linker_file_unload: file is unloading," " informing modules\n")); @@ -768,10 +770,12 @@ linker_file_unload(linker_file_t file, int flags) * Don't try to run SYSUNINITs if we are unloaded due to a * link error. */ - if (file->flags & LINKER_FILE_LINKED) { + if ((file->flags & LINKER_FILE_LINKED) != 0) { file->flags &= ~LINKER_FILE_LINKED; linker_file_unregister_sysctls(file); linker_file_sysuninit(file); + EVENTHANDLER_INVOKE(kld_unload, file->filename, file->address, + file->size); } TAILQ_REMOVE(&linker_files, file, link); @@ -788,9 +792,6 @@ linker_file_unload(linker_file_t file, int flags) LINKER_UNLOAD(file); - EVENTHANDLER_INVOKE(kld_unload, file->filename, file->address, - file->size); - if (file->filename) { free(file->filename, M_LINKER); file->filename = NULL;