From nobody Tue Aug 16 19:52:26 2022 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 4M6hd722s5z4ZHt8; Tue, 16 Aug 2022 19:52:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M6hd71cR1z3XsB; Tue, 16 Aug 2022 19:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660679547; 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=jhDEmpMoJEIvcp5qkf/QBK5h/uPP3sR/FidIr0iZ4bw=; b=b1t+4zZg5qnXXMM+B6iINo0OE4xV4EdAMHjzNAr3moSF8jyYafmMgTOpGyBvIY9AcUG4Tp sYVTdJywpZ3EFst/ZP19LL/T9nBaJMdAVCqvzCa3UoSViptMEhRljSziqwM6kNCRdnaoTB OolSXJfkmz1keUKbadUeNfMrlPWNrwUSt6a3eDklyQVtHR/FJXh080LArl4TLLuMzF96/E m9PEVqRxNxpxACBbUuS3roPHkU5bpQ+jiKwcpDliceYJh9P2QSEtWssP7y1hie1OiWz+z+ YbG89TN8T3O4xLFsf68IAT6io1J5LdMt1qqiblq9eBgARk48gSP3tqv1h3Tpzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M6hd70hSszMch; Tue, 16 Aug 2022 19:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27GJqQvv057534; Tue, 16 Aug 2022 19:52:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27GJqQ9r057533; Tue, 16 Aug 2022 19:52:26 GMT (envelope-from git) Date: Tue, 16 Aug 2022 19:52:26 GMT Message-Id: <202208161952.27GJqQ9r057533@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fbafa98a94cc - main - Disallow invalid PT_GNU_STACK 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbafa98a94cc7f4f30d71003c230d1b5d4c5960b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660679547; 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=jhDEmpMoJEIvcp5qkf/QBK5h/uPP3sR/FidIr0iZ4bw=; b=i7wfYD3DxL9v+vH4O6LfUVcosjrzK07yDVN5upgZdUN8AGD6yOASDlQCaEDA49E1zdbmf8 DQB7JqF0RP+zadM6uUHvYIOUTm6lL0LGO+mwSe4I8jeA1q2GArlPD8AaRFM696UuJnzzuK nnWiSZQ9pS59AsgmoQ7/V9WAXjIzBFGF4lllqRFG4FHvuEhSHfUKVpfyL5FzzBwYFpbEoP DlVAeL89CX9siD4YsN+1gB6sBjegwUCHbG/UOlAciJMPd3WBn2vPVwLmnYGoldAnZPhzVw x0bCIwMS28wyDfpcCHeDURvtjd0DHYP8Fx+taASWg4ipNVL0GmSYHu1VsbVGzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660679547; a=rsa-sha256; cv=none; b=In53VgB75jrf4wtbrpaV5BQxhxs4exTX6Ag6vdfGFKr9Oy8gv4nVsWVi8BnFOTO8vFHLL0 EJ40K26hJexM0PGlKX1M0kgncCsgByJXUqj4K41fnM0aluYr/pAKnnGBBsMba6/7Cn5gNm yIz1RKBGRGW+zzoLgs5Af5Mo2l+S+9jrXT3ElEL8uD5QUmLQJ/eHttR/lT/p8B4VWFHZjN A+CE4vVoNhdZn9bDPW6zCAP0cSGy8q9vYwXc03Rr0bfsgixam8bro4cSr5L2dv8IrW3XH/ vmgCxouY7XROjYMpK+kFeqR7CKRd7lLpCDmjujgjDmgzdRK9Jrkn/LUp8ibCgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fbafa98a94cc7f4f30d71003c230d1b5d4c5960b commit fbafa98a94cc7f4f30d71003c230d1b5d4c5960b Author: Ed Maste AuthorDate: 2022-03-18 17:56:32 +0000 Commit: Ed Maste CommitDate: 2022-08-16 19:52:21 +0000 Disallow invalid PT_GNU_STACK Stack must be at least readable and writable. PR: 242570 Reviewed by: kib, markj MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35867 --- sys/kern/imgact_elf.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 38be7d100ae9..6c36c880a2c0 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1221,9 +1221,16 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp) goto ret; break; case PT_GNU_STACK: - if (__elfN(nxstack)) + if (__elfN(nxstack)) { imgp->stack_prot = __elfN(trans_prot)(phdr[i].p_flags); + if ((imgp->stack_prot & VM_PROT_RW) != + VM_PROT_RW) { + uprintf("Invalid PT_GNU_STACK\n"); + error = ENOEXEC; + goto ret; + } + } imgp->stack_sz = phdr[i].p_memsz; break; case PT_PHDR: /* Program header table info */