From nobody Sun Sep 04 23:59:34 2022 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 4MLTCV64dTz4c3MF; Sun, 4 Sep 2022 23:59:34 +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 4MLTCV5GWNz3jyq; Sun, 4 Sep 2022 23:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662335974; 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=vuBhCDh9ewrqvAjAyAa0WlKSrfkT/6K0aA9/ncbNCQY=; b=FprfCFnToJgE2UWS7d5MBvtj+Yy2ciivdsOpdueBYdRu1YTTd6HgVApbXRl7nyTGtB03R7 ag2VbGdOFpcQ4mSCqjtHK2v4P5nABvhwbGNabAbv5N4G4NC0b8uKPgEe2AA0Ix1uNJQ1/e pnRWt6aCE0uus740Pmw74XmWlGD9kEnd16MhhYyiSRMR3/kPrOHxLCaDr9qs5uU7rcfubf AjAQZtYe269Vj+9b4hrZEnpvcNGkhGIRImYXoNhGw+5SiY6UOZaaWcMS0VhrK8SpHKjzqV 6b4gkavbAQ0RlYtEYfPF3uBcF89tcuMnIphK9YzpMqX3JYbrGeMC6B6gFogBrg== 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 4MLTCV4JySzfK5; Sun, 4 Sep 2022 23:59:34 +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 284NxYet083040; Sun, 4 Sep 2022 23:59:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 284NxYLe083039; Sun, 4 Sep 2022 23:59:34 GMT (envelope-from git) Date: Sun, 4 Sep 2022 23:59:34 GMT Message-Id: <202209042359.284NxYLe083039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: aa182e53e8ed - stable/12 - Disallow invalid PT_GNU_STACK 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/12 X-Git-Reftype: branch X-Git-Commit: aa182e53e8ed760407a140bf906d5e623dbcea98 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662335974; 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=vuBhCDh9ewrqvAjAyAa0WlKSrfkT/6K0aA9/ncbNCQY=; b=KToQi7E7Wy8XHrf49YT/uqhFyDrD9RFtka/rb+V8nFDoKhkFe/3dG7z2LfHN0iRYJZ/9AC 90JbQOwNgFCVDHM4OlTA03pmwVPHe12fJQSQzmXjcGMktLf15i64aLgVPJWfesuzsEUu20 o4Y4jDyaMvkU0MQcKZvjsoEaxdVkuyMxvXQ1uQRQe2Zcladgvr8X0P9YosIbPY28xw26kg r3nzOxoRdeRHD4PbrCvIMuFoHNEi+1mt1PbPxp5QCXpcttMSXgET7q8h9uT01qMRL4GqmF HLqQaPGjtJzPK7qK/QYJgY/h8JREJINh6YyTqq47ZjGT6fnY3TBFolzYP6C0Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662335974; a=rsa-sha256; cv=none; b=M0FGvJpqTI6xLhW8rBM6PLgq9RqkxNwBPn/M7E20RrYCBo77VIgcnZZBL3LttLc+oq+MoU jECPLQgAz5mGXm/1lUbXwf5HtYE2ea8i6YYm3xRhVla2vzkiFi6cHBGhbvRpASoFC8TMEN RZajwOR+kPdpFdw5kduB96bmXdLD0vevZ07FhE/bJaOOEFGVRM0HdhvON4Q5ijw8qkmZ25 +SCb8AxaHFi8y2YnPbqUpu7se9wH9mIgrf0/KObNuQyde+OyWMySCGZQlY719g2w3q68x1 Ts7B0U3lAxf8yBLmUWWJ4yh6ccAqX8unpclw2Blet3GtxBLF5RD/TgC3AC4TvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=aa182e53e8ed760407a140bf906d5e623dbcea98 commit aa182e53e8ed760407a140bf906d5e623dbcea98 Author: Ed Maste AuthorDate: 2022-03-18 17:56:32 +0000 Commit: Ed Maste CommitDate: 2022-09-04 23:57:00 +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 (cherry picked from commit fbafa98a94cc7f4f30d71003c230d1b5d4c5960b) --- 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 dba87d2853ca..9f5cd77f097f 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1141,9 +1141,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 */