D12985.id35130.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D12985.id35130.diff
View Options

	Index: head/usr.sbin/bhyve/uart_emul.c
	===================================================================
	--- head/usr.sbin/bhyve/uart_emul.c
	+++ head/usr.sbin/bhyve/uart_emul.c
	@@ -678,20 +678,24 @@
	if (retval == 0)
	retval = fcntl(sc->tty.fd, F_SETFL, O_NONBLOCK);

	+ if (retval == 0) {
	#ifndef WITHOUT_CAPSICUM
	- cap_rights_init(&rights, CAP_EVENT, CAP_IOCTL, CAP_READ, CAP_WRITE);
	- if (cap_rights_limit(sc->tty.fd, &rights) == -1 && errno != ENOSYS)
	- errx(EX_OSERR, "Unable to apply rights for sandbox");
	- if (cap_ioctls_limit(sc->tty.fd, cmds, nitems(cmds)) == -1 && errno != ENOSYS)
	- errx(EX_OSERR, "Unable to apply rights for sandbox");
	- if (!uart_stdio) {
	- if (caph_limit_stdin() == -1 && errno != ENOSYS)
	+ cap_rights_init(&rights, CAP_EVENT, CAP_IOCTL, CAP_READ,
	+ CAP_WRITE);
	+ if (cap_rights_limit(sc->tty.fd, &rights) == -1 &&
	+ errno != ENOSYS)
	errx(EX_OSERR, "Unable to apply rights for sandbox");
	- }
	+ if (cap_ioctls_limit(sc->tty.fd, cmds, nitems(cmds)) == -1 &&
	+ errno != ENOSYS)
	+ errx(EX_OSERR, "Unable to apply rights for sandbox");
	+ if (!uart_stdio) {
	+ if (caph_limit_stdin() == -1 && errno != ENOSYS)
	+ errx(EX_OSERR,
	+ "Unable to apply rights for sandbox");
	+ }
	#endif
	-
	- if (retval == 0)
	uart_opentty(sc);
	+ }

	return (retval);
	}