From owner-dev-commits-src-main@freebsd.org Tue Sep 21 21:19:42 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5B5D667B564; Tue, 21 Sep 2021 21:19:42 +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 4HDZ7f28DYz4bFG; Tue, 21 Sep 2021 21:19:42 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2B7D12E58; Tue, 21 Sep 2021 21:19:42 +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 18LLJgiv041688; Tue, 21 Sep 2021 21:19:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18LLJgqC041687; Tue, 21 Sep 2021 21:19:42 GMT (envelope-from git) Date: Tue, 21 Sep 2021 21:19:42 GMT Message-Id: <202109212119.18LLJgqC041687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 397f188936c8 - main - Remove SV_CAPSICUM 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/main X-Git-Reftype: branch X-Git-Commit: 397f188936c8a29b6a2d4d13f0cf5681b4bcb9a3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Sep 2021 21:19:42 -0000 The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=397f188936c8a29b6a2d4d13f0cf5681b4bcb9a3 commit 397f188936c8a29b6a2d4d13f0cf5681b4bcb9a3 Author: Konstantin Belousov AuthorDate: 2021-09-13 09:49:13 +0000 Commit: Konstantin Belousov CommitDate: 2021-09-21 21:18:44 +0000 Remove SV_CAPSICUM It was only needed for cloudabi Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D31923 --- sys/kern/kern_exec.c | 4 ---- sys/sys/sysent.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index b6959dc18f50..cbe0152a8001 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -681,10 +681,6 @@ interpret: goto exec_fail_dealloc; } - /* ABI enforces the use of Capsicum. Switch into capabilities mode. */ - if (SV_PROC_FLAG(p, SV_CAPSICUM)) - sys_cap_enter(td, NULL); - /* * Copy out strings (args and env) and initialize stack base. */ diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h index 36d5e473142e..ad50bf56e87d 100644 --- a/sys/sys/sysent.h +++ b/sys/sys/sysent.h @@ -165,7 +165,7 @@ struct sysentvec { #define SV_IA32 0x004000 /* Intel 32-bit executable. */ #define SV_AOUT 0x008000 /* a.out executable. */ #define SV_SHP 0x010000 /* Shared page. */ -#define SV_CAPSICUM 0x020000 /* Force cap_enter() on startup. */ +#define SV_AVAIL1 0x020000 /* Unused */ #define SV_TIMEKEEP 0x040000 /* Shared page timehands. */ #define SV_ASLR 0x080000 /* ASLR allowed. */ #define SV_RNG_SEED_VER 0x100000 /* random(4) reseed generation. */