From nobody Sun Nov 08 16:18:30 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 4jMylC0gzjz6ybhv for ; Sun, 08 Nov 2026 16:18:31 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jMylB44rqz4GNQ for ; Sun, 08 Nov 2026 16:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794154710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SCinetSqoKeL2NUrRPjEOEXKvwfzO++mqKpCibnhoSA=; b=xoL+wxjDlddFd+5bynjjMNhzI02c8RvlHGYUVEcWa8IFqmU0p/+Te2aHH8WIeCcXiVNIk9 Bzu+uPpRdjvsuGHHdTTEraFYCxjCb6eF3q/Pl6aTZIDTVHwmIzsVVfgvgMC4bb59VdxH1e mBum0c2o3bSjRCJkKcI6aZuUSnViu2DLBIjaq/IByKjJxgA0uHUdZSvbrghr52E/Oi6elj So4ZlXt41x1wuzv9bLiE8oIUkxF0aKu5DcO4idRUXhfhyJgq975n1Ztp9lXbkqPs6n4RkO obiAjQ402CX9zYPZeRja3msxorFzK+voTQCsCUd2bP36eGNnw3h71XeUCJ6JgQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794154710; b=CzKC8emE0Ea5UC0oNN5eyrTdQPNNbOP4tXWC3xprlSSLLNrZyxl+DfFRCJBoStg0alsjF+ YEdHXLN/ZIAdgeEwhu3RjesNPCocsMTdfSsqHPqAY1ip31pBhlVP9oGnDzL3ZPdEvD89nm RQtMoG0nCFbwz4aJy7NCPiLsCmEn1IIO/87B2v5mMJTr3z/1EQhMN71GUpXa/ssIZIIm/j 7SyUvsNpNWLIc9eDgHs5Byln+xBd7i1K6guM4L8gHO1hwhZXoTxdc6wBGyz3rfFu0xztRQ 0D2HfEvJJwzv36KbzMfk3VU9crzpWnrskBv2TGqkBK+JngcdOHKxBZqNIDIbEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794154710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SCinetSqoKeL2NUrRPjEOEXKvwfzO++mqKpCibnhoSA=; b=pV66kf6zS0jk1TXAIGpGN5mQ9t2ZNFlpfGIFJdqHj5dkB3R6h+T6r/G7Z42/VDx5L5BFjx 46ygayHfRp6L1L6N6AHcpOA0q5yuOcjukU78/ftc6pGSei8AjCaAB8upVow+ZsLsbjgAuB df878UvapPpb4bRzIzdNbMBi/SgWG3txoEfW9Syz0eCmtG7teecInRBiU0R106qm0npZt5 SBsbvMP+0t1eyBpx25AwGIaHMSamNKiX2GzeYAi7vlRjgwJOs/30fbjLJxg3sUrYaZCYtG V6E4XjWTdywpOuSxlLQoIpGbM7Korsvr5vffbo3BNI+faaM1Kg6JD5+V62FmwA== 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 4jMylB3Mgyz1DPh for ; Sun, 08 Nov 2026 16:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 137d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 08 Nov 2026 16:18:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Osvaldo Janeri Filho From: Mark Johnston Subject: git: 14d828a2ff6e - main - link_elf_obj: guard reltab/relatab frees in link_elf_unload_file() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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/main X-Git-Reftype: branch X-Git-Commit: 14d828a2ff6e130b76754fd6e9947e332469fd09 Auto-Submitted: auto-generated Date: Sun, 08 Nov 2026 16:18:30 +0000 Message-Id: <6af0a0d6.137d2.2feaa790@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=14d828a2ff6e130b76754fd6e9947e332469fd09 commit 14d828a2ff6e130b76754fd6e9947e332469fd09 Author: Osvaldo Janeri Filho AuthorDate: 2026-11-08 15:45:19 +0000 Commit: Mark Johnston CommitDate: 2026-11-08 16:18:13 +0000 link_elf_obj: guard reltab/relatab frees in link_elf_unload_file() link_elf_unload_file() frees the per-section relocation tables by iterating ef->nreltab / ef->nrelatab, but dereferences ef->reltab / ef->relatab unconditionally. The counts are set while scanning the section headers, before the tables are allocated, so an error on the load path reaches it with a non-zero count and a NULL table, faulting on ef->relatab[0].rela. Reachable from link_elf_load_file() once a valid relocation section has been counted, e.g. a later section with sh_info >= e_shnum (D60937). Guard the loops with the table pointer, as is already done for ef->progtab above. MFC after: 1 week Reviewed by: markj, kib Differential Revision: https://reviews.freebsd.org/D61140 --- sys/kern/link_elf_obj.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 5be78aa147bd..e80b2798c37f 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -1349,12 +1349,16 @@ link_elf_unload_file(linker_file_t file) return; } - for (i = 0; i < ef->nreltab; i++) - free(ef->reltab[i].rel, M_LINKER); - for (i = 0; i < ef->nrelatab; i++) - free(ef->relatab[i].rela, M_LINKER); - free(ef->reltab, M_LINKER); - free(ef->relatab, M_LINKER); + if (ef->reltab != NULL) { + for (i = 0; i < ef->nreltab; i++) + free(ef->reltab[i].rel, M_LINKER); + free(ef->reltab, M_LINKER); + } + if (ef->relatab != NULL) { + for (i = 0; i < ef->nrelatab; i++) + free(ef->relatab[i].rela, M_LINKER); + free(ef->relatab, M_LINKER); + } free(ef->progtab, M_LINKER); if (ef->object != NULL)