From nobody Thu Oct 08 20:44:02 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 4j125t64pNz4n2qH for ; Thu, 08 Oct 2026 20:44: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j125t37YTz4c4h for ; Thu, 08 Oct 2026 20:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492242; 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=f9Q9XZlZ8oqrX/Z+Zz4WyzD8Ni8nIWjdgSi8Ot+igYE=; b=B7TYc9QaKcyvirNXrC+BBJjTdfhk0AniqULFYtIiPL67HdM24qlM3ceLCEQFK9cf1zyb+1 uP004s2pI5BVela+LicC+8DRlx9s5tAOLSrEvauNBZ/zDyrq2QzQ7G+/lntSFhzM/Ro9cD ul3vyJG1W2RADBBuLOsUVESjQ6qrobQwYiLUa9T50W5z9mYyZl+NzWRCayMwDGhEo1Cj+S Mtlnc/JUMkz8m3BRUmbzen8EJ+kxlHg3emA2fKa19VOpDdHKxq5WyqBJP94ubat4tq9zLK vxv0+V35/kCZvYDbRI6HC83VXqqm7++OHVLaXpXzcu4JxL2+QWp6P5Ds5SZaEA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492242; b=p01poL4dmXK1NE+Xnq7JKO6CQE/mVm3T3rWKI9p83Wuc02/L7dGDDgzoyhav9bdRTc9DzH QHrpmeqBhaMdkWQt+mfG3/awcVheu4fDEMQNtoyasc5kcnh1MsCZhnvbGGZYpzISgCpCH2 BZTqsWVH3QEigYlYMRqb/vjJacNSooECnQXCqiXZfKApWG3eGAjNKUUnPzB/s7NGDPnLcc 7i8A4SMEPU6O9inozmxajWHzzU9sNx22twYHidhr7l1puUO/MWnkINtZlPBaSErMM7A0a0 6iFGrpERzATG04+qcwOPKBElnty+NgfMQPfXd/vGlwt5Mdz7a16nB+HRwttIsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492242; 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=f9Q9XZlZ8oqrX/Z+Zz4WyzD8Ni8nIWjdgSi8Ot+igYE=; b=TD0EEL04q3Sq1BRj1g1FYHjaHFRMlOTYDkWLe6rkzbpphgw7sqDgGWtZmU18efCCXjc/xm +Hx5rF42cMzo3jPPnwS3CpmSB5Mi1bRVqjVh3AGFd6EmUY8GVHAfU7Ep8R5YpVN4ABd3Ft /OT6m6FHHDKVMo+igsqfPFZsIROK5d5ieFh6OdoV/Hx0c/lPSo+2qm//pzZpJ5rcwNR1Ev dekiXElW/Eqjui2JmXnD4eQw1DWXd9Ak8CirLgt7+NYUZEvhzHTXSpomUlrHfZZhBw77Al GyWHKFVenI2RFX/uqTcfIuccHi/SmGx74WqPmU+cZXTgnn+bbK2mIfyMbk/Vfw== 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 4j125t1pbDzwWX for ; Thu, 08 Oct 2026 20:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31c7e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:44:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 999ce4475a01 - stable/15 - kld: Reject kernel modules with PT_LOAD segments where filesz > memsz 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 999ce4475a0199577e5b08fce12624df0e38d0c6 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:44:02 +0000 Message-Id: <6ac80092.31c7e.1fddc761@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=999ce4475a0199577e5b08fce12624df0e38d0c6 commit 999ce4475a0199577e5b08fce12624df0e38d0c6 Author: John Baldwin AuthorDate: 2026-07-31 17:52:42 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:32 +0000 kld: Reject kernel modules with PT_LOAD segments where filesz > memsz All sorts of places in the ELF loading code assume that filesz <= memsz, so check that explicitly up front. Reported by: Jane Smith (via D57785) Reviewed by: jrtc27, kib Differential Revision: https://reviews.freebsd.org/D58542 (cherry picked from commit 486dfbb67e093a461a5ebd97f66be9b345f9de77) --- sys/kern/link_elf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index ef4609333d3d..e6301691affa 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -1110,6 +1110,14 @@ link_elf_load_file(linker_class_t cls, const char* filename, error = ENOEXEC; goto out; } + + if (phdr->p_memsz < phdr->p_filesz) { + link_elf_error(filename, + "Invalid program header"); + error = ENOEXEC; + goto out; + } + /* * XXX: We just trust they come in right order ?? */