From nobody Mon Apr 15 14:05:32 2024 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 4VJ88D6Wr0z5Gfgy; Mon, 15 Apr 2024 14:05:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJ88D31qdz4W4P; Mon, 15 Apr 2024 14:05:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713189932; 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=y+DoC4sH10jWeIpgm1Uk5j3A56WG4I2SPFsGYCorOuc=; b=geqZryifnFZz+pe4XggcfW1J7+TVb/8WEt+F+BGi6uWtUG8zM9xXwpcb2q2pVTBTdfsJMs LzC9AFjnKHdVt+U+fy3IlIvlNG4QCSRmxCqhYPSPc27E7ZGHEqaIZrQYr8svKuJrmB0fqD XfIWQtNx4Enqi8y/Tz1OguxRYd4Cwl4UH7/dtJ5LoPjU1iiyZFHVfK62aF4eesW0Titr1C 5JyjNJBrihih2DxwnQoRKO71mewRDdn3fT5SvWIvKE/aTblK9n4P2LdXhidd2YVAUAvHSS KU85Rwn18df1SntsOm5bSwRd7byabrpYOHbBNDJHwn3IDuScIvuEfO+Rgvsq7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713189932; a=rsa-sha256; cv=none; b=weSaAZ++wBD7jUABmNfWQEmvbYKI+UwDIOBdp76Ijqn5XSfboocMKXkRVLXzZqSzwmcmM1 3wjxWUHKGzuZnE+1SM4k5rRhf80St7pHTMoQTq7aeLqawpqrFt4YiMlC43OMNgSJwSnE9q yECQvVHRGl6dKVgUTW57xzHRNtGUxb47ZFBO7XRCsZhdjSQzHMdE11jzZAux2pw4pmB/XM MlRA+xwi4/KGIaBSoqASGKu5w3BZvBmFiIUGOl+EzHFfZ4QLfmZk8CkqVsEybpkEuGSgFb 8k5PXsrcH4gwObdU30lRZXXF1eL3/j8lXjj8Jbapnu654sJO7j17hmQ6VAUBng== 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=1713189932; 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=y+DoC4sH10jWeIpgm1Uk5j3A56WG4I2SPFsGYCorOuc=; b=KvHCRZwvaGN4h0RZLzzL7KVjng6AVGvqO6ZQxYVJe5tYjJYEL7bvHCubFwJ28xrsCipO60 Qephi5UpBCF21lz+7+Cr6e2UUs9JMbc8219kW7j+HAEOihb+f8pvF1oNP7hc/2mXPH/9u2 3C18lo2j/plqqNi7cl+g/tJRVAcQQFK+HC44UykWcnlvqyhncfM9TiPnDXOLetfff++nAw LMqqwVyVFuiv7iVQ+CCmEBqO8nn5BKmjCxuCN9rHrxDN1paBdIMnyT5rKoIWaZ6L3tZzky XLBm6TFSH9yjy9ggAnx7g/HtnLrXBqfHVfeer0f3QfQHhpUOtJvNOdejf9twOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJ88D2bxSz12h3; Mon, 15 Apr 2024 14:05:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43FE5WDD070045; Mon, 15 Apr 2024 14:05:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FE5WUi070042; Mon, 15 Apr 2024 14:05:32 GMT (envelope-from git) Date: Mon, 15 Apr 2024 14:05:32 GMT Message-Id: <202404151405.43FE5WUi070042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 19621b977df3 - stable/14 - kern linker: Don't invoke dtors without having invoked ctors 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/14 X-Git-Reftype: branch X-Git-Commit: 19621b977df3aa11ace8d2f79d3e3e56d9ceaf76 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=19621b977df3aa11ace8d2f79d3e3e56d9ceaf76 commit 19621b977df3aa11ace8d2f79d3e3e56d9ceaf76 Author: Mark Johnston AuthorDate: 2024-03-31 18:14:02 +0000 Commit: Mark Johnston CommitDate: 2024-04-15 14:05:13 +0000 kern linker: Don't invoke dtors without having invoked ctors I have a kernel module which fails to load because of an unrecognized relocation type. link_elf_load_file() fails before the module's ctors are invoked and it calls linker_file_unload(), which causes the module's dtors to be executed, resulting in a kernel panic. Add a flag to the linker file to ensure that dtors are not invoked if unloading due to an error prior to ctors being invoked. At the moment I only implemented this for link_elf_obj.c since link_elf.c doesn't invoke dtors, but I refactored link_elf.c to make them more similar. Fixes: 9e575fadf491 ("link_elf_obj: Invoke fini callbacks") Reviewed by: zlei, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D44559 (cherry picked from commit 7ef5c19b219e47684afd9d8d9126df39edc8d885) --- sys/kern/kern_linker.c | 1 + sys/kern/link_elf.c | 15 +++++++++++++-- sys/kern/link_elf_obj.c | 30 +++++++++++++++++++++++++++--- sys/sys/linker.h | 5 +++++ 4 files changed, 46 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index c9e31437c7c6..15fd7e8c30fb 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -629,6 +629,7 @@ linker_make_file(const char *pathname, linker_class_t lc) return (NULL); lf->ctors_addr = 0; lf->ctors_size = 0; + lf->ctors_invoked = LF_NONE; lf->dtors_addr = 0; lf->dtors_size = 0; lf->refs = 1; diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 5be2db9d32bf..c7871e8e2e0d 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -345,7 +345,7 @@ link_elf_error(const char *filename, const char *s) } static void -link_elf_invoke_ctors(caddr_t addr, size_t size) +link_elf_invoke_cbs(caddr_t addr, size_t size) { void (**ctor)(void); size_t i, cnt; @@ -360,6 +360,17 @@ link_elf_invoke_ctors(caddr_t addr, size_t size) } } +static void +link_elf_invoke_ctors(linker_file_t lf) +{ + KASSERT(lf->ctors_invoked == LF_NONE, + ("%s: file %s ctor state %d", + __func__, lf->filename, lf->ctors_invoked)); + + link_elf_invoke_cbs(lf->ctors_addr, lf->ctors_size); + lf->ctors_invoked = LF_CTORS; +} + /* * Actions performed after linking/loading both the preloaded kernel and any * modules; whether preloaded or dynamicly loaded. @@ -390,7 +401,7 @@ link_elf_link_common_finish(linker_file_t lf) #endif /* Invoke .ctors */ - link_elf_invoke_ctors(lf->ctors_addr, lf->ctors_size); + link_elf_invoke_ctors(lf); return (0); } diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index b853ca284f7d..2718a92d7864 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -648,6 +648,30 @@ link_elf_invoke_cbs(caddr_t addr, size_t size) } } +static void +link_elf_invoke_ctors(linker_file_t lf) +{ + KASSERT(lf->ctors_invoked == LF_NONE, + ("%s: file %s ctor state %d", + __func__, lf->filename, lf->ctors_invoked)); + + link_elf_invoke_cbs(lf->ctors_addr, lf->ctors_size); + lf->ctors_invoked = LF_CTORS; +} + +static void +link_elf_invoke_dtors(linker_file_t lf) +{ + KASSERT(lf->ctors_invoked != LF_DTORS, + ("%s: file %s ctor state %d", + __func__, lf->filename, lf->ctors_invoked)); + + if (lf->ctors_invoked == LF_CTORS) { + link_elf_invoke_cbs(lf->dtors_addr, lf->dtors_size); + lf->ctors_invoked = LF_DTORS; + } +} + static int link_elf_link_preload_finish(linker_file_t lf) { @@ -674,7 +698,7 @@ link_elf_link_preload_finish(linker_file_t lf) /* Apply protections now that relocation processing is complete. */ link_elf_protect(ef); - link_elf_invoke_cbs(lf->ctors_addr, lf->ctors_size); + link_elf_invoke_ctors(lf); return (0); } @@ -1230,7 +1254,7 @@ link_elf_load_file(linker_class_t cls, const char *filename, #endif link_elf_protect(ef); - link_elf_invoke_cbs(lf->ctors_addr, lf->ctors_size); + link_elf_invoke_ctors(lf); *result = lf; out: @@ -1250,7 +1274,7 @@ link_elf_unload_file(linker_file_t file) elf_file_t ef = (elf_file_t) file; u_int i; - link_elf_invoke_cbs(file->dtors_addr, file->dtors_size); + link_elf_invoke_dtors(file); /* Notify MD code that a module is being unloaded. */ elf_cpu_unload_file(file); diff --git a/sys/sys/linker.h b/sys/sys/linker.h index b94cd9f27405..461a32d5529b 100644 --- a/sys/sys/linker.h +++ b/sys/sys/linker.h @@ -82,6 +82,11 @@ struct linker_file { size_t size; /* size of file */ caddr_t ctors_addr; /* address of .ctors/.init_array */ size_t ctors_size; /* size of .ctors/.init_array */ + enum { + LF_NONE = 0, + LF_CTORS, + LF_DTORS, + } ctors_invoked; /* have we run ctors yet? */ caddr_t dtors_addr; /* address of .dtors/.fini_array */ size_t dtors_size; /* size of .dtors/.fini_array */ int ndeps; /* number of dependencies */