svn commit: r464382 - in head/devel/libvirt: . files

[Roman Bogorodskiy]

Author: novel
Date: Tue Mar 13 14:38:12 2018
New Revision: 464382
URL: https://svnweb.freebsd.org/changeset/ports/464382

Log:
  devel/libvirt: fix crash in bhyve driver
  
  Fix crash on domains with interfaces that have no model specified.
  
  PR:		221877
  Reported by:	David Harrigan

Added:
  head/devel/libvirt/files/patch-src_bhyve_bhyve__command.c   (contents, props changed)
Modified:
  head/devel/libvirt/Makefile

Modified: head/devel/libvirt/Makefile
==============================================================================
--- head/devel/libvirt/Makefile	Tue Mar 13 14:37:48 2018	(r464381)
+++ head/devel/libvirt/Makefile	Tue Mar 13 14:38:12 2018	(r464382)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvirt
 PORTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/

Added: head/devel/libvirt/files/patch-src_bhyve_bhyve__command.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libvirt/files/patch-src_bhyve_bhyve__command.c	Tue Mar 13 14:38:12 2018	(r464382)
@@ -0,0 +1,15 @@
+--- src/bhyve/bhyve_command.c.orig	2018-02-26 09:02:18 UTC
++++ src/bhyve/bhyve_command.c
+@@ -56,6 +56,12 @@ bhyveBuildNetArgStr(virConnectPtr conn,
+     int ret = -1;
+     virDomainNetType actualType = virDomainNetGetActualType(net);
+ 
++    if (net->model == NULL) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                       _("NIC model must be specified"));
++        return -1;
++    }
++
+     if (STREQ(net->model, "virtio")) {
+         if (VIR_STRDUP(nic_model, "virtio-net") < 0)
+             return -1;