From nobody Fri Jul 31 17:57:39 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 4hBYgl43sdz6nFWN for ; Fri, 31 Jul 2026 17:57:39 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hBYgl1ZYHz46DN for ; Fri, 31 Jul 2026 17:57:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785520659; 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=Cr89QZNTe/TYST+Dl6pZE1FpK5XrF05FgggfYaPICy8=; b=qsYlzfEmncSnOaiIku4If7ds9hpE3WwO0+JjIgk/3UcR9jYf+63bQnRgli+IWTMdIxDfdz 8kcviZjdGVocS/Ng24VN/Xoouyh5YceisTy/y32UgsOFLCpJIILszgQ7wUQ7aqN3ybQwFc kYxzZsd5kkgHIunalpjmt/r8QbSaLHYRxOWBJ9yvM/GNZpQLalCZnFJEI9MX9CHqFyU8dS L/8kgiht8N5+ey2vk8KqQV0sAQprpK3qDpz6Q8/Nha7/TOZHg74wxrqW+ze/7TykpGntOl NfzRZbxGx5ohtSnKWw8TDF6FaXFpParo57cWzNaoXIgoIHMf4Nlo4avgYlHhzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785520659; a=rsa-sha256; cv=none; b=gqtzNnLNRZXzJsPh6MMqjExGry5JC9OjcAWbX78glIxywfppDJmlaHACHYbwwJeFUwyRe5 MiZiss/mcnOZiREzFkIgAeGQQZ9+HLyaga00Bs04PHaESvpJYGFVeaiXfoTDD4Mm/f+B7p DA1+HDlI9WNfOyerXb/9IytUovJZfbrpL6ivqsDWT8SBK6yD4Jamo2CIzdFLCOY0x4sCqh M28Zl+gPPJVIaFA/a/TSfrPdFpz8VC8ukcYb3l2G42n/EsC0gmhKnFcGts1SLbCshteG7f h0R0A3A5UJtCx+jRPoZcHwGODPRzjjlVNX4LmmiPG1hM4dn/HwAHop15dJXKqw== 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=1785520659; 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=Cr89QZNTe/TYST+Dl6pZE1FpK5XrF05FgggfYaPICy8=; b=Q/cmf/geBiymMWEamQWr8mswNPCICVDQH41euuItxHfdwxuLzM+/k7q8yDFnoKZiZF268b 7r9y7I/BghhaLpHJglTniu+hc6Ysv1TXlD3C86wWayYlUvlcAqXOZAyt+likLVAd1SvFP0 mXZov1RyyB/1s+WNbHU1tIRUy+JJXDzmtqgvcXTrFXDX8f13ulW8uZuKWGgSwqkMyJh3kR s4CEqxs8muMNR5OSfQpDvFaRl5Khar2/bxt0xrqM31+RWi79u1RPfMgrGEC1FORPGOEvAg XGQ6tzAST06MXOffNZwbCeupZjxK5TgsA9ljEMWjrwi0YLES4/WtX0k9idLc6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hBYgl0dvPz18bg for ; Fri, 31 Jul 2026 17:57:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e9e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 31 Jul 2026 17:57:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 486dfbb67e09 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 486dfbb67e093a461a5ebd97f66be9b345f9de77 Auto-Submitted: auto-generated Date: Fri, 31 Jul 2026 17:57:39 +0000 Message-Id: <6a6ce213.3e9e0.7622834f@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=486dfbb67e093a461a5ebd97f66be9b345f9de77 commit 486dfbb67e093a461a5ebd97f66be9b345f9de77 Author: John Baldwin AuthorDate: 2026-07-31 17:52:42 +0000 Commit: John Baldwin CommitDate: 2026-07-31 17:52:42 +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 --- 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 6ab5f4a39580..d7aeefa25433 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 ?? */