From nobody Thu Oct 08 20:44:00 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 4j125r3g8Dz6wCr1 for ; Thu, 08 Oct 2026 20:44:00 +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 4j125r1FLYz4c01 for ; Thu, 08 Oct 2026 20:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492240; 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=QEJ6PFwit/84AE5aiD6Z9WWzrom4zurSuW30lJCLO6k=; b=w0dG6k9sdIfW3/7Thz6AsndD9+b/zEUblxTuWhUuEWl1OIyjHfICiCxFtwl987Fq5IFROy pAGpksJINkowSnr0VSJHsxqY2hf1dQraQUv8GT8hU/shlqLNBOh0nWTJB4fzOami0t65lx HDghUMQVch8RVhPpcd7jF5RVRQd5QQqLTcZlRdySc6v3r94guDv2Saujf/W05CIRFSC+Dm /ltYaHr7cIa7nQq8WBc41mua4Nejw+ABoZRpkjWAX24RcMnJSZ7h0V88Lj40TZVwah91ir Ba60NqZF9TLF2IK+cyh0CHThOr9NU6ul/ZuEiY7l5u2OBGfrD6UpnR1fgyZFsQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492240; b=C1ZF8qYBiTNm3O+/iai8UgZsprAHcIgRfsZCsVm6gmzGO25qvQnTRCAnUhM4UAN9LpkfZv fZIOIFHojAtOoHAeNhIe9Re7GR6Mjzwhc853nuIV8gE5QDplSBVIsPLjOwqqc9nVmEck+d mj6kt0oaySZO8FHLRJrU6UML75WnCP6p85Ma7YvVB/jDmvPYGYKLnE9BJ4p+YyTzgfned6 zGpoO1Dtaq0jpHYq58Y6H8uyDfK/EqVqa3PdZQM+SfIfFOpQM8hH/GQvs77x984b528RAI EPDSmEF6u7nIls4sKOnwtPQIj8YEcTAcebt0TLaz9kmnbLHRpOEcmpuHa6TkWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492240; 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=QEJ6PFwit/84AE5aiD6Z9WWzrom4zurSuW30lJCLO6k=; b=aRxg8oPHkffkNJCqVyz+zXhQN+AYGNgEu4nG5/lUOTogqVKgfRw4w8s68oPc/cYDb/XLjk MtzpO0bUA/9uem9tdzlu3kDpV+xALaWczr3SaajDS5NHvpGzx2X0IrEu9dG9p5BqroMOqq sSQHP5f72MJp7uwtlrhjbTuVt5GsvYR2eP+z1nNNYALszB24ZloGqVFyE9U6qAonvKGIAh 6dDr6ZzRkyhY07XHCiz52NRqIdS0ojJG1P69FprtiDoKSupgN2pKyIRobmHpATbi77beQh D6MfP93SOVVYqjyQOS0ZGa8Xf68MpForzZdon+VZo6qnTH+lVOHly/7a5kFSVA== 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 4j125r09kBzwJ1 for ; Thu, 08 Oct 2026 20:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3341d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:44:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: db8b81ca99aa - stable/15 - rtld: Reject ELF files with PT_LOAD or PT_TLS 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: db8b81ca99aaa06a5ffbe5ca2d364a14d7987067 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:44:00 +0000 Message-Id: <6ac80090.3341d.9582ee7@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=db8b81ca99aaa06a5ffbe5ca2d364a14d7987067 commit db8b81ca99aaa06a5ffbe5ca2d364a14d7987067 Author: John Baldwin AuthorDate: 2026-07-31 17:52:24 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:32 +0000 rtld: Reject ELF files with PT_LOAD or PT_TLS segments where filesz > memsz All sorts of places in the ELF loading code assume that filesz <= memsz, so check that explicitly up front. The kernel already performs this check for the PT_LOAD segments in the main binary and rtld in imgact_elf.c. Reviewed by: jrtc27, kib Differential Revision: https://reviews.freebsd.org/D58541 (cherry picked from commit 535eb24d8451bad8de745937018800df1895a9aa) --- libexec/rtld-elf/map_object.c | 12 ++++++++++++ libexec/rtld-elf/rtld.c | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c index f00f2a84ed07..6852daf13d68 100644 --- a/libexec/rtld-elf/map_object.c +++ b/libexec/rtld-elf/map_object.c @@ -121,6 +121,12 @@ map_object(int fd, const char *path, const struct stat *sb, bool ismain) break; case PT_LOAD: + if (phdr->p_memsz < phdr->p_filesz) { + _rtld_error("%s: invalid PT_LOAD segment", + path); + goto error; + } + segs[++nsegs] = phdr; if ((segs[nsegs]->p_align & (page_size - 1)) != 0) { _rtld_error( @@ -140,6 +146,12 @@ map_object(int fd, const char *path, const struct stat *sb, bool ismain) break; case PT_TLS: + if (phdr->p_memsz < phdr->p_filesz) { + _rtld_error("%s: invalid PT_TLS segment", + path); + goto error; + } + phtls = phdr; break; diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 63bf32c87e3c..00cbba276ef3 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1748,6 +1748,12 @@ digest_phdr(const Elf_Phdr *phdr, int phnum, caddr_t entry, const char *path) break; case PT_TLS: + if (ph->p_memsz < ph->p_filesz) { + _rtld_error("%s: invalid PT_TLS segment", + path); + return (NULL); + } + obj->tlsindex = 1; obj->tlssize = ph->p_memsz; obj->tlsalign = ph->p_align;