From nobody Mon Jan 17 21:13:04 2022 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 95E0C1976C08; Mon, 17 Jan 2022 21:13:04 +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 4Jd4PX2vWjz3Ff5; Mon, 17 Jan 2022 21:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642453984; 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=VMqrvy1mTq/gBejscX4WIXPKXdRqUclpwGCoMJx5ckQ=; b=muTrsRA01Bx3wrcd3oiJee4eXj0heO5Shu0XH73xr7FH3YUujI6N5q7EJz3lXujEYFhDm7 AtUxlPcBxPaVNjOeUXZ2J+YgM0smTVj6wkN6Y3PoyCm8IuUZlftLY4QpMoPBBi1AJHSLLN F4IwO/mhbwA05wu5dkouX2PqOaNrj7aaSH3R3sJ9QPFN5DaZgIKd2DmLhVZV4EgBwdwdh/ 9tTs+4ZIE8ujFCKwzw7bf0uN2QbjOOQ+W3Io02KooAp0LiOPEyfgFu9aJnXaPzt9MgZAe0 NLAb1eyjLjORQGONpN7X1miBIyUd7qlE6/PJC+BShOIA8v3SNhQttct63jGscw== 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 37370151AB; Mon, 17 Jan 2022 21:13:04 +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 20HLD4Le006853; Mon, 17 Jan 2022 21:13:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20HLD43e006852; Mon, 17 Jan 2022 21:13:04 GMT (envelope-from git) Date: Mon, 17 Jan 2022 21:13:04 GMT Message-Id: <202201172113.20HLD43e006852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1544f5add8c7 - main - Revert "kern_exec: Add kern.stacktop sysctl." 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1544f5add8c72c28e939a1557e3e319c6cfe5008 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642453984; 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=VMqrvy1mTq/gBejscX4WIXPKXdRqUclpwGCoMJx5ckQ=; b=IexBT1Z8MMOY7Ni7UbcoELGs86RIF5nxyVMgumOhI/NfFEQ5/Kw82cmnaIaCpPl6quQ221 EbOtQJy5bPyc4hxLy6iXONRwK8y8VJKy1hN8+aulxINFoT4spHYPImxeUmCKX6vDW7lYp2 NAVECKPuGz706Bc9vbx06F72LvFNSmvLFwh0SIpvGQUL0xT0bmOMEa/DoUSCLp4uJFyo2U 1WXls4YsssT3uvK+QqVARJVJNV5HkZEM60qJ40rJ2FpSPKws/CusRcO5/ho5F9/Yq1cRUV rHHzKH0i+9wB8qr7Z/TppuBNR3d1hEG0NqbVeeRfWappfcdFCdWynhEy2oUprA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642453984; a=rsa-sha256; cv=none; b=VMaokK2YpZXWk8imCbUNFmQNI5aVJMFTkulBhJRd4FiPaKZpdbQyMDN9KMe4B/aj+4QvA4 asjxQpuN6AYbuOcLINR/k1RdYeOvrQs9duWaCLyYtgioc8kfGWeibcXRSZY5t/pvnasgTf N/O+iZYE15KDILwP0kPATrTfr16y9EgJCdToZwZOhYQPmX2ohmBFYhgnWRPkXztUwWrATp Dacj4KHaTRM9MtFLE3d08YJcBvmfyqasBigxfZAkDxkat8OZlO4PDDlskvyH968sZxuiSF hWhw2xSirhW9a6mzg8N/AMmpnTx6R0mljLxdEs8EmoaQFi7UhZx2zkNB17y/lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1544f5add8c72c28e939a1557e3e319c6cfe5008 commit 1544f5add8c72c28e939a1557e3e319c6cfe5008 Author: Mark Johnston AuthorDate: 2022-01-17 16:41:58 +0000 Commit: Mark Johnston CommitDate: 2022-01-17 16:41:58 +0000 Revert "kern_exec: Add kern.stacktop sysctl." The current ASLR stack gap feature will be removed, and with that the need for the kern.stacktop sysctl is gone. All consumers have been removed. This reverts commit a97d697122da2bfb0baae5f0939d118d119dae33. Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33704 --- sys/kern/kern_exec.c | 31 +------------------------------ sys/sys/sysctl.h | 1 - 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 7e7fbe31976a..198f69ff4214 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -119,7 +119,6 @@ SYSCTL_INT(_kern, OID_AUTO, coredump_pack_vmmapinfo, CTLFLAG_RWTUN, static int sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS); static int sysctl_kern_usrstack(SYSCTL_HANDLER_ARGS); -static int sysctl_kern_stacktop(SYSCTL_HANDLER_ARGS); static int sysctl_kern_stackprot(SYSCTL_HANDLER_ARGS); static int do_execve(struct thread *td, struct image_args *args, struct mac *mac_p, struct vmspace *oldvmspace); @@ -134,10 +133,6 @@ SYSCTL_PROC(_kern, KERN_USRSTACK, usrstack, CTLTYPE_ULONG|CTLFLAG_RD| CTLFLAG_CAPRD|CTLFLAG_MPSAFE, NULL, 0, sysctl_kern_usrstack, "LU", "Top of process stack"); -SYSCTL_PROC(_kern, KERN_STACKTOP, stacktop, CTLTYPE_ULONG | CTLFLAG_RD | - CTLFLAG_CAPRD | CTLFLAG_MPSAFE, NULL, 0, sysctl_kern_stacktop, "LU", - "Top of process stack with stack gap."); - SYSCTL_PROC(_kern, OID_AUTO, stackprot, CTLTYPE_INT|CTLFLAG_RD|CTLFLAG_MPSAFE, NULL, 0, sysctl_kern_stackprot, "I", "Stack memory permissions"); @@ -196,31 +191,7 @@ sysctl_kern_usrstack(SYSCTL_HANDLER_ARGS) #endif error = SYSCTL_OUT(req, &p->p_sysent->sv_usrstack, sizeof(p->p_sysent->sv_usrstack)); - return (error); -} - -static int -sysctl_kern_stacktop(SYSCTL_HANDLER_ARGS) -{ - vm_offset_t stacktop; - struct proc *p; - int error; - - p = curproc; -#ifdef SCTL_MASK32 - if (req->flags & SCTL_MASK32) { - unsigned int val; - - val = (unsigned int)(p->p_sysent->sv_usrstack - - p->p_vmspace->vm_stkgap); - error = SYSCTL_OUT(req, &val, sizeof(val)); - } else -#endif - { - stacktop = p->p_sysent->sv_usrstack - p->p_vmspace->vm_stkgap; - error = SYSCTL_OUT(req, &stacktop, sizeof(stacktop)); - } - return (error); + return error; } static int diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index b455fec7209f..71a34652ff44 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -976,7 +976,6 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); #define KERN_HOSTUUID 36 /* string: host UUID identifier */ #define KERN_ARND 37 /* int: from arc4rand() */ #define KERN_MAXPHYS 38 /* int: MAXPHYS value */ -#define KERN_STACKTOP 39 /* int: USRSTACK - stack gap */ /* * KERN_PROC subtypes */