git: 89c3c32647a5 - main - bhyve: Gracefully handle virtio-scsi with no conf

[Ryan Moeller]

The branch main has been updated by freqlabs:

URL: https://cgit.FreeBSD.org/src/commit/?id=89c3c32647a5099b297af2958e5a939eff0c0ce0

commit 89c3c32647a5099b297af2958e5a939eff0c0ce0
Author:     Ryan Moeller <freqlabs at FreeBSD.org>
AuthorDate: 2021-04-22 16:06:08 +0000
Commit:     Ryan Moeller <freqlabs at FreeBSD.org>
CommitDate: 2021-04-22 16:06:08 +0000

    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
---
 usr.sbin/bhyve/pci_virtio_scsi.c | 3 +++
 1 file changed, 3 insertions(+)

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);