From nobody Wed Oct 25 16:56:40 2023 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 4SFw7X4hx3z4xl8R; Wed, 25 Oct 2023 16:56:40 +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 4SFw7X438Pz4bVR; Wed, 25 Oct 2023 16:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698253000; 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=SkCdawWp93v3XDEI4yD3B4rNjdzA6DNGc8TmcbiVyM4=; b=sG0LrcMrE9BYqVHsMaXyXR1729tcj9cOnYXxigoDo/ffa+FiUhKu/Q/xzpTqExUiTTup+N 52nVyyk5ikMGWl4NCP+P9OJBoeJekwCqn1shTeFzSbHByIYWAVbT3wNKnEn9I63aql2Ry6 BY7+QiTHWOZ+KPcyHiBoC11UIx9MR65hN/HyBa/yxSD09SIvPwTNGiqqngdSXR7KUeDL36 vmmdYdGT21FS3nWJsnyNjXM0RlKh1I+SvfwoVlAmHmEjkbbv1VGMzwRqbqNAkncL4KaTlf gmE7uUvownopZ1g6Nj+w358a5n5JMz5JaNMwI7cuTxJ12COt/ayIqe2lFzjG0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698253000; a=rsa-sha256; cv=none; b=ryT9/IyspgTNV65qDlLFheG/QefM4jSAO6MJYDObLqQ0Lsz4ZvtiVkzKzv8ostAW3URU0L s/CDWXFVhL3brAnpyljA5xs6DN7ql0bnZFInL02reIaLcYJ1CFf1CuyhhLZ6DHRM2XHgtB fRzZ4/SI4rFuk9TmvPRk5cvYvkyGcBz058syijLOMjrKN507YcjHu7XUAxDuHrXqprQuPL DSLt0uNClEeskvUWQVNxZOZdcmCTBbHpcGMyjy80RE3OFijPfwOsSI6M8ujrnLoa4++OVa LGhz4X6rSWQuJrXT4VbZoB363UyTLBZ49R+TNC0ePIzQwqu4623Yqt28Yq9z8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698253000; 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=SkCdawWp93v3XDEI4yD3B4rNjdzA6DNGc8TmcbiVyM4=; b=nawHpPVPemaU0qgHxNovHJkMsr+O5Coyhk/j16V+9iclPfg7FBFeEWNksYX8grVHt7jp0y fTge8JDrmdlm00/reVrSYEYRK8xHs5KrJ9J+C7RZIkWrH4fGXQQUAjncB/E5Vden88SV1J 4Jy7poBLRDs3t75V1jXaublMLHWolO9J3CfOcTIlT9OsxU8Wyla+ICibg0d1fe6SKDt/iA mjhGCoceH6F3MGqx+SezgRA3DOr+jNh8+aGxEmMn0IT9fcmB5jp3cqP8ijtOFTrTJmvTV2 COAwbGWmuh1ZNip8ZwKi2DZ7HRuF80o/4qSQ/bZQWAluY+u+ixolTUG1Pj7QDA== 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 4SFw7X35h3z1Bxg; Wed, 25 Oct 2023 16:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39PGueRc021867; Wed, 25 Oct 2023 16:56:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PGue61021864; Wed, 25 Oct 2023 16:56:40 GMT (envelope-from git) Date: Wed, 25 Oct 2023 16:56:40 GMT Message-Id: <202310251656.39PGue61021864@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: 952196961fe7 - releng/14.0 - bhyve: Use VMIO_SIOCSIFFLAGS instead of SIOCGIFFLAGS 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 952196961fe7849e6b4d517bc2aaa562eaa4b9c9 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=952196961fe7849e6b4d517bc2aaa562eaa4b9c9 commit 952196961fe7849e6b4d517bc2aaa562eaa4b9c9 Author: Jan Bramkamp AuthorDate: 2023-09-04 08:38:25 +0000 Commit: Mark Johnston CommitDate: 2023-10-25 16:52:37 +0000 bhyve: Use VMIO_SIOCSIFFLAGS instead of SIOCGIFFLAGS Creating an IP socket to invoke the SIOCGIFFLAGS ioctl on is the only thing preventing bhyve from working inside a bhyve jail with IPv4 and IPv6 disabled restricting the jailed bhyve process to only access the host network via a tap/vmnet device node. Approved by: re (gjb) PR: 273557 Fixes: 56be282bc999 ("bhyve: net_backends, automatically IFF_UP tap devices") Reviewed by: markj MFC after: 1 week (cherry picked from commit fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a) (cherry picked from commit 700689bc2abaf860801b3896ceae86b0072f406c) --- usr.sbin/bhyve/net_backends.c | 52 ++++--------------------------------------- 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c index fa7cd9c81f46..99781cfdcbb6 100644 --- a/usr.sbin/bhyve/net_backends.c +++ b/usr.sbin/bhyve/net_backends.c @@ -42,9 +42,7 @@ #include #include -#if defined(INET6) || defined(INET) #include -#endif #include #include #define NETMAP_WITH_LIBS @@ -180,17 +178,6 @@ SET_DECLARE(net_backend_set, struct net_backend); * The tap backend */ -#if defined(INET6) || defined(INET) -static const int pf_list[] = { -#if defined(INET6) - PF_INET6, -#endif -#if defined(INET) - PF_INET, -#endif -}; -#endif - struct tap_priv { struct mevent *mevp; /* @@ -222,11 +209,8 @@ tap_init(struct net_backend *be, const char *devname, { struct tap_priv *priv = NET_BE_PRIV(be); char tbuf[80]; - int opt = 1; -#if defined(INET6) || defined(INET) - struct ifreq ifrq; - int s; -#endif + int opt = 1, up = IFF_UP; + #ifndef WITHOUT_CAPSICUM cap_rights_t rights; #endif @@ -254,39 +238,11 @@ tap_init(struct net_backend *be, const char *devname, goto error; } -#if defined(INET6) || defined(INET) - /* - * Try to UP the interface rather than relying on - * net.link.tap.up_on_open. - */ - bzero(&ifrq, sizeof(ifrq)); - if (ioctl(be->fd, TAPGIFNAME, &ifrq) < 0) { - WPRINTF(("Could not get interface name")); - goto error; - } - - s = -1; - for (size_t i = 0; s == -1 && i < nitems(pf_list); i++) - s = socket(pf_list[i], SOCK_DGRAM, 0); - if (s == -1) { - WPRINTF(("Could open socket")); + if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, &up)) { + WPRINTF(("tap device link up failed")); goto error; } - if (ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) { - (void)close(s); - WPRINTF(("Could not get interface flags")); - goto error; - } - ifrq.ifr_flags |= IFF_UP; - if (ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) { - (void)close(s); - WPRINTF(("Could not set interface flags")); - goto error; - } - (void)close(s); -#endif - #ifndef WITHOUT_CAPSICUM cap_rights_init(&rights, CAP_EVENT, CAP_READ, CAP_WRITE); if (caph_rights_limit(be->fd, &rights) == -1)