From nobody Mon Oct 31 22:17:31 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 4N1SFR4jbzz4gfpw; Mon, 31 Oct 2022 22:17:31 +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 4N1SFR3y0Tz4827; Mon, 31 Oct 2022 22:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667254651; 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=bkyCUN1uhfbTWeG6WozurjaI2o+z+4hgNSzYhQKW4UE=; b=ceduzzGUrp5GC1XP29mj/0wJ8MN4RbiOAZRfid92sTQW3Er5mJcTDpNLKgxgNMJCvHP8eD vJS+cgORluKRSSnKHhNiFU1ut0XcfeuC1szYA/jIG2quNUwY3Bx68TRYJU4Xrx09a5sIjh k242pW5AXeASX500+0zdv2UsMNSLGq+UW4WSryvYG/vCMMTMGPBuHacu9KBkEEcyCFBbja EQi16pe0m5ekDnNOYq/1GOnYOrds9j1ITkv+mR9hSVS4WmMbigcXCcnljw34q4jaO7S+rl u2LMSnzoQbNjIOnd0pSidoiZu/diXk9VMU740W3hDMW3DNB5iapLaVMfijF3zA== 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 4N1SFR33Qjzshk; Mon, 31 Oct 2022 22:17:31 +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 29VMHVXi029336; Mon, 31 Oct 2022 22:17:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29VMHVSg029335; Mon, 31 Oct 2022 22:17:31 GMT (envelope-from git) Date: Mon, 31 Oct 2022 22:17:31 GMT Message-Id: <202210312217.29VMHVSg029335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e1ec48421287 - stable/13 - bhyve: Use the new vm_limit_rights() interface 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/stable/13 X-Git-Reftype: branch X-Git-Commit: e1ec4842128773ba3342f9ae0fbd35ab671aea30 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667254651; 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=bkyCUN1uhfbTWeG6WozurjaI2o+z+4hgNSzYhQKW4UE=; b=I01yEAbyfZgCkG9nvPDpN1Ou11tBQlKf9ZbY2iO8tcRCuCrKBOQCWu3V4WJxfb7RZGgxsE UMVVJT+i/65xdusV/uxE4N62yg/eHPKA0e/Ym7yoLzlsiE5cf7/jsP4hUFAG5VA+PAL3uT 0k+OvqXEGuf9U49plcEuqLWRs7T+6+BRurHeO+CmohGjdeEuNyV0WtdEuaiAp8VSMwofgq hxuPbSrk3hVp4MegqusmNU3s+w4IlprZDi+JWk5ySYTOVyHI/WozVJ83rLN6yHced8G9Io y4QoutqEjStJy0JmYSiBocuZ3K8ZRpIdu5zyrxAZ6BPFutHf6J/ESo20Z8Vsng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667254651; a=rsa-sha256; cv=none; b=QZFWXsxSxyxFaqudjdNtn+dC8LdKDQp97SFDdd2dedYb/ioL0dAE7RFnYf5cHCRQNJQpHN ZfgmxGhWTR6ZAd/BDP19dnt8DHlWRv48iqUzCfKpiUBBdO09z7hTFCFzWCjwCYWUflcy5c qrU9zOm0ielo0lBmO2XfTbG4DLFmrazb54WxMnLfWYZDe7KGUT/p1lcuHTV6VKcALKV8V0 Jy1ZCvmqCDQ2IGnsBnd0kYdi+ymZ3Wl4prQ7rm+AGyuyx1OO9nza8FblMnqzCWQ16ebdse Czh2u9abR9EAP6YIb0dbv5tdFPHLll635EWL6bOzSIMqHiQ57RLZDoFJkb94KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e1ec4842128773ba3342f9ae0fbd35ab671aea30 commit e1ec4842128773ba3342f9ae0fbd35ab671aea30 Author: Mark Johnston AuthorDate: 2022-10-24 21:32:04 +0000 Commit: Mark Johnston CommitDate: 2022-10-31 13:29:27 +0000 bhyve: Use the new vm_limit_rights() interface This addresses a compiler warning arising from the fact that bhyve needs to cast away a const qualifier in order to call free(). No functional change intended. Reviewed by: jhb (cherry picked from commit fb7ce0a95ef1e796c10def3ed660e487ffb77c75) --- usr.sbin/bhyve/bhyverun.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index f01950a453d3..0915e833b19b 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1068,11 +1068,6 @@ do_open(const char *vmname) struct vmctx *ctx; int error; bool reinit, romboot; -#ifndef WITHOUT_CAPSICUM - cap_rights_t rights; - const cap_ioctl_t *cmds; - size_t ncmds; -#endif reinit = romboot = false; @@ -1112,16 +1107,8 @@ do_open(const char *vmname) } #ifndef WITHOUT_CAPSICUM - cap_rights_init(&rights, CAP_IOCTL, CAP_MMAP_RW); - if (caph_rights_limit(vm_get_device_fd(ctx), &rights) == -1) - errx(EX_OSERR, "Unable to apply rights for sandbox"); - vm_get_ioctls(&ncmds); - cmds = vm_get_ioctls(NULL); - if (cmds == NULL) - errx(EX_OSERR, "out of memory"); - if (caph_ioctls_limit(vm_get_device_fd(ctx), cmds, ncmds) == -1) - errx(EX_OSERR, "Unable to apply rights for sandbox"); - free((cap_ioctl_t *)cmds); + if (vm_limit_rights(ctx) != 0) + err(EX_OSERR, "vm_limit_rights"); #endif if (reinit) {