From nobody Mon Dec 1 14:21:02 2025 X-Original-To: dev-commits-src-main@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 4dKmKV5w8Lz6JcYm for ; Mon, 01 Dec 2025 14:21:02 +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 4dKmKV5N23z3Dl0 for ; Mon, 01 Dec 2025 14:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598862; 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=yBFmNcpCgcbFf95DQslRylXejeG+g2LX39TlLOgm5HM=; b=IBE58tlWnlhmJwXCvAPk/VcPfjWrOq7ndH3yueHl6OF1hdhdfqywjTTTJvsrahpIvOs/IG rCugEkig9ycwtA3gNdf2CGgLZNAqHo8H8ZV5c4Jj7DRpBZfwRADw2+NjZwUKCCg/bnoniS w6XUNfAdnLU4j1EAEGr05BqNGLRzocwnf7kj9e0xP9AJoGnNduciCDyoRMnDn7va5KG6ui CdLBpZMf+2bGKichQwB0BLOazCqwIDLKUq5MotrbltzXVYsjIDrlgGrjbbp3JEwdWA4VAS 65zSKSqU226Ad5GkX9d1TZCYaWrorCiF3n1PA+QfF2mFLn1ykzqG3vKLCP+stQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598862; 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=yBFmNcpCgcbFf95DQslRylXejeG+g2LX39TlLOgm5HM=; b=AqDmdZBVQ/pLFhSZs/G5QavUmoqaV2PXTeGBxd/64kNpmN77uBkyZpVjEp09KIu81AHJsb l5YZUDFoBUnsK8oj59SLa/94lNrexYOp2GhqgP9AkvxRGV/u2D/A2xOB+1w+oQtBNpu1cC IsI1vq5SvxJDfCE/XCnBHdfZHM9LT+KnYNEj2CwIPEfGGnOA7nu9VADbuPQPzWt8Is7j1q oAVzBmclISsexTcckyvb5ilQfbkPKOx7JOCjIamUYyAKhxUqKCbi0EFe7w2cpOJlSnDDKv elA8mWAFzUbZ4Yz/MUhwAk2kl82Sut8/91i5ciH3WIele0GiUaAebitr5IWflg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764598862; a=rsa-sha256; cv=none; b=K3cN9qH4rqCMarcoR+0RKmRFauYYtV8pZzveeAOjDZFrVcvybqYDw3xXENtO/epnYT4XQ8 CRH8BTzA519PY8eNnbVDoBsJvXCUVTPPf8Apt2joYEzZMNNF0gK/j2NyczcdDamYFrh51G EuX5jRctDlOidJGiUUivVgOM6vOBbURdt9uPJebFTmcW5uNhBJBEnyl+uFjrR4D6BrVaAu zu2L44iN2KJO+89wznXZw8gwTumZdHesdD+1PwT2MRteWoVSndXmfXodio4T7NDix3hlt0 lgO+mKy8HZASMvBOQpTxT7RiXs6bg1cT3PZIX0ixEMPv8v73w6nfDyjFY4/4Bw== 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 4dKmKV4yCFz82P for ; Mon, 01 Dec 2025 14:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2ab04 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 14:21:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 72b114169bd5 - main - linker: Avoid invoking eventhandlers on incompletely loaded files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 72b114169bd56ec157d746a2df87b3a4617065b3 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 14:21:02 +0000 Message-Id: <692da44e.2ab04.29ad736b@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=72b114169bd56ec157d746a2df87b3a4617065b3 commit 72b114169bd56ec157d746a2df87b3a4617065b3 Author: Mark Johnston AuthorDate: 2025-11-26 18:15:48 +0000 Commit: Mark Johnston CommitDate: 2025-12-01 14:19:18 +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 --- 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 e2f63cbc0c5a..9559b5233a3e 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;