aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Moeller <freqlabs@FreeBSD.org>2021-04-22 16:06:08 +0000
committerRyan Moeller <freqlabs@FreeBSD.org>2021-04-22 16:06:08 +0000
commit89c3c32647a5099b297af2958e5a939eff0c0ce0 (patch)
tree98c5ffd9184ed32b771f775aa359e824abbcdf09
parent7ea3223c7822d20acfc907683fd0153d623185b3 (diff)
downloadsrc-89c3c32647a5099b297af2958e5a939eff0c0ce0.tar.gz
src-89c3c32647a5099b297af2958e5a939eff0c0ce0.zip
bhyve: Gracefully handle virtio-scsi with no conf
Fixes segfault with the command `bhyve -s 0,virtio-scsi`, which is used by some third party software to probe bhyve for virtio-scsi support. Reviewed by: jhb MFC after: 1 day Sponsored by: iXsystems, Inc. Differential Revision: https://reviews.freebsd.org/D29926
-rw-r--r--usr.sbin/bhyve/pci_virtio_scsi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c
index aed2fe2dbb23..e8124b9b3441 100644
--- a/usr.sbin/bhyve/pci_virtio_scsi.c
+++ b/usr.sbin/bhyve/pci_virtio_scsi.c
@@ -662,6 +662,9 @@ pci_vtscsi_legacy_config(nvlist_t *nvl, const char *opts)
{
char *cp, *devname;
+ if (opts == NULL)
+ return (0);
+
cp = strchr(opts, ',');
if (cp == NULL) {
set_config_value_node(nvl, "dev", opts);