From nobody Fri Oct 09 00:20:47 2026 X-Original-To: dev-commits-src-branches@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 4j16vz4vfRz6Z20Z for ; Fri, 09 Oct 2026 00:20:47 +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 4j16vz3lw5z4Lbw for ; Fri, 09 Oct 2026 00:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791505247; 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=O+H86lVNJvAbRQMK3k0dnISe9zANjPLw22Fyhgi9RCs=; b=HcKUt4wyPw7vZd73qkvj4UzYVf0BXeB++CBwAlc2KJ7xacAuNQ1ZU3iJ6Nt5Y0wOJ2LD2U +CsaSmaWHrMLS0eGW0bbfiw3xG09UgRbFpP/kPVkrbmrO7ruzi2hzW6+ub8+PlXG0OrvV7 NNdwR6UbkvDUZG8f3tZ0aEfW8l1f35M8twB+3sV14ehdU/SrCCP4QXRI6Gb4S4NPBbVyM/ poIxuf0HLPnR2w4lZbXwzreiryLabg6FRfSsYb1yh8Xb4SFcDWVogadKbvBvUgp+vgQZgP Nj6iwdwTX9MlL8QtQX1TEdzDZZAr0lazjVgXh9J9c5q2+rGoRkGHsXz56OZ4Xg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791505247; b=Tn0uSyOdjf44n1Y0hsrU1CfeN0UJv01YRHVSockt3lZmFCyOKdrrqK0B3NDw3I7toPSV0L fBKxa+nND7iCl8gb3/2xfpVfENXAWecRXwypYKWgM0u6w6NDqGmG8FuCYMbzo3DofKNvaQ 3LsrpRDL4oyqWAY0h+F4kNFrI0vZypbYBGxd11+i/4ZpJoWAfyWfn7/c549eR0zbIa58ak HFhti/IKxKngPAKXT9iaMXNYiJoMyo6LnZ/MxtBdklnAuVQKq2wHIYlYbnoeZykgMOWAFo HA9jcRO3/7ittXoZ65mQzpIcHyVomZ59jYNAAHjZsMtlLOObRWTo+vWYsK1sww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791505247; 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=O+H86lVNJvAbRQMK3k0dnISe9zANjPLw22Fyhgi9RCs=; b=qNa7jvu8cR3WE8MHx1SMH5QdJv3Ry/2scZ00aF/KzAWSQZjJLRwZbN6wOmLamZkmLdavI3 /zVx2wzNImCMNY8n2dReIKJ60NGH5OXX/omLOlExK6VOwl24yXY6MOa+AcaQNMjCGBQqO/ aADBk02vF4CndWUMOvEMU3ccjP2MTgaOzuvgb+MCy7O135VNiwu/Y/cd3dzhUltszAHk3p hHVjsrWlExqqyg//vjJsr9Dt5Vlra3yxDfAp4eoTJXlSBNBD4WdTLV2kgqGWh6stQ5h1XL mZaGft+cYETNQZaMlh7kTDLROCKzXk8D6maSiP+WW2g0NMC8clRQBC9a1qpjkg== 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 4j16vz2kvnz12r3 for ; Fri, 09 Oct 2026 00:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19ed7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Oct 2026 00:20:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 144dbb0bc0e1 - stable/14 - rtld: Reject ELF files with PT_LOAD or PT_TLS segments where filesz > memsz List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 144dbb0bc0e1e9f6d0997a519cb9d85b3e3d95e3 Auto-Submitted: auto-generated Date: Fri, 09 Oct 2026 00:20:47 +0000 Message-Id: <6ac8335f.19ed7.426e7740@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=144dbb0bc0e1e9f6d0997a519cb9d85b3e3d95e3 commit 144dbb0bc0e1e9f6d0997a519cb9d85b3e3d95e3 Author: John Baldwin AuthorDate: 2026-07-31 17:52:24 +0000 Commit: John Baldwin CommitDate: 2026-10-08 18:47:10 +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 | 10 ++++++++++ libexec/rtld-elf/rtld.c | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c index e021f42681a8..ab48d755ef84 100644 --- a/libexec/rtld-elf/map_object.c +++ b/libexec/rtld-elf/map_object.c @@ -129,6 +129,11 @@ 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("%s: PT_LOAD segment %d not page-aligned", @@ -147,6 +152,11 @@ 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 29fad4302528..8ac6a73a962c 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1687,6 +1687,11 @@ 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;