Attachment 244627 Details for Bug 273557 – Use VMIO_SIOCSIFFLAGS instead of SIOCGIFFLAGS

[patch] Use VMIO_SIOCSIFFLAGS instead of SIOCGIFFLAGS

0001-Use-VMIO_SIOCSIFFLAGS-instead-of-SIOCGIFFLAGS.patch (text/plain), 2.18 KB, created by crest on 2023-09-04 08:53:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: crest

Created: 2023-09-04 08:53:49 UTC

Size: 2.18 KB

patch

obsolete

>From 2101ac6d26519af0d8df81030e79e096aa0efa32 Mon Sep 17 00:00:00 2001
>From: Jan Bramkamp <crest+freebsd@rlwinm.de>
>Date: Mon, 4 Sep 2023 10:38:25 +0200
>Subject: [PATCH 1/1] 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.
>
>Running bhyve this way was possible before
>f74147e26999838e03a522bf59ea33bef470d356.
>---
> usr.sbin/bhyve/net_backends.c | 38 ++++-------------------------------
> 1 file changed, 4 insertions(+), 34 deletions(-)
>
>diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c
>index 5dd5f8a17d66..68f80c03892c 100644
>--- a/usr.sbin/bhyve/net_backends.c
>+++ b/usr.sbin/bhyve/net_backends.c
>@@ -227,10 +227,7 @@ 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
>+
> #ifndef WITHOUT_CAPSICUM
> 	cap_rights_t rights;
> #endif
>@@ -258,38 +255,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"));
>-		goto error;
>-	}
>-
>-	if (ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) {
>-		(void)close(s);
>-		WPRINTF(("Could not get interface flags"));
>+	int up = IFF_UP;
>+	if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, &up)) {
>+		WPRINTF(("tap device link up failed"));
> 		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);
>-- 
>2.42.0
>

Actions: View | Diff

Attachments on bug 273557: 244627 | 244684