From nobody Fri Jul 31 17:57:36 2026 X-Original-To: dev-commits-src-main@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 4hBYgj1rZSz6nFhN for ; Fri, 31 Jul 2026 17:57:37 +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 4hBYgj0LLlz466M for ; Fri, 31 Jul 2026 17:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785520657; 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=kxl461gDmtXzn17nnTne+8S/GDOSw4jQeHjLnUAHQEk=; b=DWWsiQcCdKFy7aK879d1SD+DwksbPG2HziT5+MTld6Dgoiep1gw/fLMlf4qZP/LzA8Qies 3QaZWjI14AbdklHfnOy1tg9+ESLwpSKAyhw36IC3mKqaixIhMNg3A14L7c1i3nBgZKajA2 iDsC+DZ6InhJubwbkFCMjPysIVerW0XPzQMmLMzJYlWIEY8wr/4C3/fiBOYkiqAGrEL9Zo 68INjXSGS9/UV5m9Z0GrvFXun1atS59+/T7+NXFRmwDy6rezDPmS4+HTDp7CeLBXfT2+6k uzX+G9D2V/ihVtIsLgcwyv5oRbutpsqQpijBvSFNi0XWTBw0nLJv27gCE7wxSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785520657; a=rsa-sha256; cv=none; b=KLl1OA7j6qefzyxyzQSI67W0PN6b6+ZFE4BWoaqMTsi45fw+wG3yhxrMtBF5fCON8MfFMF sVuZ1YPdMdQtcSHV0gvqSOkXVIhSSeIR9kIT2jWRtxGxJFGHlAPgfr3/qdwN92xw7XnpuW uJsQdRHwnLP0dc5CD46zIbjEeJMFAcdn6IfjGHzjb0ty6n2BnQHkRkJFIF6nXFXEnkLrN0 SN7xR08YAImYc6ltqz7jw51vFr0oDDSfJtTUd2SueMpCDgNHjM3+f9fKVWlB62Q7UB4Mfw RhKdiqqBU/EqL7LcskUCBOolewEox7ecL2EwIjg2U0WYMxer2YJpEqOsvYG15w== 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=1785520657; 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=kxl461gDmtXzn17nnTne+8S/GDOSw4jQeHjLnUAHQEk=; b=fgRVxPXsavgTt9zG5VH7ILWVoft7DBpKV0t/zYmWsTqSv3xP3h/gF3ksukYzaqgsBd/Sn4 fMN9xoRJyQ+VGgglaq6PHFDX1eyG8N8W/RqOKLANo4CWEX9m8LF/0+i3o2PF7shy656l4a W153LnXubGFc6NeiBiUB2w8Txocv/6Tw42CGRoFay/YlEawiw41y4Rq4Nk6JaH7ww1ORFj VUvPxdwW4u+sZ2xXnmSx6EsfOcph2VFK+s8JQ5hUt+Ep6q5qgEiMDUcZ8jh2Z+uWAaaWv4 puXOV01dFl19Vq9vb6j185CXNx3HBCdETpZgllOqVu0/zo2SN99kqDrIJdP49Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hBYgh66wwz18v0 for ; Fri, 31 Jul 2026 17:57:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e855 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 31 Jul 2026 17:57:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 535eb24d8451 - main - rtld: Reject ELF files with PT_LOAD or PT_TLS segments where filesz > memsz List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 535eb24d8451bad8de745937018800df1895a9aa Auto-Submitted: auto-generated Date: Fri, 31 Jul 2026 17:57:36 +0000 Message-Id: <6a6ce210.3e855.334a627@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=535eb24d8451bad8de745937018800df1895a9aa commit 535eb24d8451bad8de745937018800df1895a9aa Author: John Baldwin AuthorDate: 2026-07-31 17:52:24 +0000 Commit: John Baldwin CommitDate: 2026-07-31 17:52:24 +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 --- 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 6f8160e003d7..81ed62d99a18 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 864148df99ba..bb4314c03039 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;