From nobody Sat Jun 13 01:03:54 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 4gcdSB2t5Yz6hSTx for ; Sat, 13 Jun 2026 01:03:54 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gcdSB0Ylsz3lkd for ; Sat, 13 Jun 2026 01:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781312634; 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=jDIZDlF7XspVeCFeiS/hlc31ISyd1f0tTZubXa+j22g=; b=FtnB5BeHu9cI3H0qs/f6+QoVmvOKasXNlzLKwxd7oL3gIEoc/C80+x1478sOXxVBPlzX10 BjcNrVT6hpX3iYGbljlU1sAMEli3GCcR1arXOMGa1eh+/WWFQ3zSn1ZOxNrJUtdwhcvqlz RhvC2ErsbR/eBJNaq4I9kkYBPRU7igj/L1LCvDUt0hLlHsqjHf5rI4IC6GxLZt7yyMnZWl qbZ9waFZjKKKtj4rzVKQ0zPKDvxW1N2UXKZCF5p1tzIQRBz4M3pAKRcm7wWX+nU2PX1heo w0mtmeFxxC9kRa6S1IryYQ1/k2BiQLAEudmmHlJUcrgM/fTnhXdlcj3jm9XCLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781312634; a=rsa-sha256; cv=none; b=MewshSr4j8jmWjWJl6j95ABbbk8ENVGon7GeY26M8rmy2/iCilPYiB5zcYYTFWt4M1PqgK r4lOw8uHYA3DRL7tdYa4zeUsNRY/BBlcOy8ct8XMgniou9ZBFd1aQvKjUf+Bmm1ZChb/zG 7knJ/Jfzfp9higqMlyfnR/cIbIk6OMTHexBvk1oBSYlk+JOsDsEYTn9uSl6bqWHrX4ruP9 vrffDfojUl8XJMwqnFf+Gq4uBeEO54HuTNS/xwUCW2hOJD6QapR8X7p96sxy71v3CP4hW/ s6m/xx+kTg4lRJ1r+UXFMOtT+xQuyHfJ3Ty+z9/glFtKj9kmxet+GoEcfYzj9Q== 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=1781312634; 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=jDIZDlF7XspVeCFeiS/hlc31ISyd1f0tTZubXa+j22g=; b=jv2xu2s/3ngWKuINHPB3mEyq7gAf6ofkCQ3xFz+rNecCRBYLGrc0vWzF6jgGVzPn9brBfc pkTgh1R9AJMxnojpF1Ziowd+5a3wE0gOfLAs9/WApqiRArnPi0i+5pG27riG0YSfhOQtRo q7sUVjxJYo9wEjBiEuIuA7xEsFBC5DIEC5EeB0fxYEC851tEg1BrmwwIv128vFL+Thh2ys SeYWLfHTFXXepHloVMBKpGW6O5ZkSeeQzIPWpc5yg9hiDHtY2SplvZ+UNzlsRuNlZ+VOSK Ag7dGgx/EYloElWRuE12E9Zw7o8bYAUjuO/P2fJoV9VMh7gDtHkNCcxKXJ4VFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcdSB06s1z11fZ for ; Sat, 13 Jun 2026 01:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2174c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Jun 2026 01:03:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 093cc4194e6e - stable/15 - imgact_elf: handle unaligned phdrs 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 093cc4194e6e88569bc25ecb73f6d887c5d69037 Auto-Submitted: auto-generated Date: Sat, 13 Jun 2026 01:03:54 +0000 Message-Id: <6a2cac7a.2174c.8904f5d@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=093cc4194e6e88569bc25ecb73f6d887c5d69037 commit 093cc4194e6e88569bc25ecb73f6d887c5d69037 Author: Konstantin Belousov AuthorDate: 2026-06-08 01:22:51 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-13 00:58:36 +0000 imgact_elf: handle unaligned phdrs PR: 295629 (cherry picked from commit 0b269737f9ca057826a6c9376c2474b1ae5bc91c) --- sys/kern/imgact_elf.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 15a3472731d6..a9ee58d941c4 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -858,12 +858,12 @@ __elfN(load_file)(struct thread *td, const char *file, u_long *addr, goto fail; } - if (!aligned(imgp->image_header + hdr->e_phoff, Elf_Addr) || - hdr->e_phnum > __elfN(phnums)) { + if (hdr->e_phnum > __elfN(phnums)) { error = ENOEXEC; goto fail; } - if (__elfN(phdr_in_zero_page)(hdr)) { + if (__elfN(phdr_in_zero_page)(hdr) && + aligned(imgp->image_header + hdr->e_phoff, Elf_Addr)) { phdr = (const Elf_Phdr *)(imgp->image_header + hdr->e_phoff); } else { VOP_UNLOCK(imgp->vp); @@ -1157,10 +1157,6 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp) free_interp = false; m_phdrs = NULL; - if (!aligned(imgp->image_header + hdr->e_phoff, Elf_Addr)) { - uprintf("Unaligned program headers\n"); - return (ENOEXEC); - } if (hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize < hdr->e_phoff) { uprintf("PHDRS wrap\n"); return (ENOEXEC); @@ -1170,7 +1166,8 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp) hdr->e_phnum, __elfN(phnums)); return (ENOEXEC); } - if (__elfN(phdr_in_zero_page)(hdr)) { + if (__elfN(phdr_in_zero_page)(hdr) && + aligned(imgp->image_header + hdr->e_phoff, Elf_Addr)) { phdr = (const Elf_Phdr *)(imgp->image_header + hdr->e_phoff); } else { VOP_UNLOCK(imgp->vp);