[illumos-gate merge]

commit be235d17490f6a5ad01c6a5319530fce66d88389
    12801 libdiskmgt leaks PROM device information handles like a sieve
commit bd05d33960c9701232eaa8bdb6a5ce585912ffc6
    13016 bhyve cannot emulate MMIO from bootrom
commit 2c834067bf731e663c6269489bf5dc0a9b4c6299
    12977 smb3 server encryption leak in smb2_send_reply
commit fe417ad0efdf365d5438ae46904118fa27ae38b8
    12853 bhyve manifests should include BSD license
commit 1a10a9077a9effc574b7f797a4d321dd0cea4197
    12419 intel_nb5000: variable may be used uninitialized

19 files changed, 212 insertions, 10 deletions

diff --git a/exception_lists/copyright b/exception_lists/copyright
index 5e5e6a8f42..05d12b3fbd 100644
--- a/exception_lists/copyright
+++ b/exception_lists/copyright
@@ -495,6 +495,8 @@ usr/src/uts/common/sys/scsi/adapters/mpt_sas/mpi/*
 usr/src/uts/sparc/nsmb/ioc_check.ref
 
 # bhyve sources
+usr/src/cmd/bhyve/THIRDPARTYLICENSE
+usr/src/cmd/bhyve/THIRDPARTYLICENSE.descrip
 usr/src/cmd/bhyve/acpi.[ch]
 usr/src/cmd/bhyve/ahci.h
 usr/src/cmd/bhyve/atkbdc.[ch]
@@ -545,10 +547,16 @@ usr/src/cmd/bhyve/usb_mouse.c
 usr/src/cmd/bhyve/vga.[ch]
 usr/src/cmd/bhyve/virtio.[ch]
 usr/src/cmd/bhyve/xmsr.[ch]
+usr/src/cmd/bhyvectl/THIRDPARTYLICENSE
+usr/src/cmd/bhyvectl/THIRDPARTYLICENSE.descrip
 usr/src/cmd/bhyvectl/bhyvectl.c
 usr/src/compat/bhyve/*
 usr/src/contrib/bhyve/*
+usr/src/lib/libvmmapi/THIRDPARTYLICENSE
+usr/src/lib/libvmmapi/THIRDPARTYLICENSE.descrip
 usr/src/lib/libvmmapi/common/vmmapi.[ch]
+usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE
+usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE.descrip
 usr/src/uts/i86pc/io/vmm/amd/*.[chs]
 usr/src/uts/i86pc/io/vmm/intel/*.[chs]
 usr/src/uts/i86pc/io/vmm/intel/offsets.in
@@ -576,3 +584,5 @@ usr/src/cmd/bhyve/README.license
 usr/src/cmd/bhyvectl/README.license
 usr/src/lib/libvmmapi/README.license
 usr/src/uts/i86pc/io/vmm/README.license
+usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE
+usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE.descrip
diff --git a/usr/src/cmd/bhyve/THIRDPARTYLICENSE b/usr/src/cmd/bhyve/THIRDPARTYLICENSE
new file mode 100644
index 0000000000..66b39dc950
--- /dev/null
+++ b/usr/src/cmd/bhyve/THIRDPARTYLICENSE
@@ -0,0 +1,26 @@
+
+SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+
+Copyright (c) 1992-2020 The FreeBSD Project.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
diff --git a/usr/src/cmd/bhyve/THIRDPARTYLICENSE.descrip b/usr/src/cmd/bhyve/THIRDPARTYLICENSE.descrip
new file mode 100644
index 0000000000..77026fc8a3
--- /dev/null
+++ b/usr/src/cmd/bhyve/THIRDPARTYLICENSE.descrip
@@ -0,0 +1 @@
+Bhyve hypervisor
diff --git a/usr/src/cmd/bhyvectl/THIRDPARTYLICENSE b/usr/src/cmd/bhyvectl/THIRDPARTYLICENSE
new file mode 100644
index 0000000000..66b39dc950
--- /dev/null
+++ b/usr/src/cmd/bhyvectl/THIRDPARTYLICENSE
@@ -0,0 +1,26 @@
+
+SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+
+Copyright (c) 1992-2020 The FreeBSD Project.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
diff --git a/usr/src/cmd/bhyvectl/THIRDPARTYLICENSE.descrip b/usr/src/cmd/bhyvectl/THIRDPARTYLICENSE.descrip
new file mode 100644
index 0000000000..77026fc8a3
--- /dev/null
+++ b/usr/src/cmd/bhyvectl/THIRDPARTYLICENSE.descrip
@@ -0,0 +1 @@
+Bhyve hypervisor
diff --git a/usr/src/contrib/bhyve/THIRDPARTYLICENSE b/usr/src/contrib/bhyve/THIRDPARTYLICENSE
new file mode 100644
index 0000000000..66b39dc950
--- /dev/null
+++ b/usr/src/contrib/bhyve/THIRDPARTYLICENSE
@@ -0,0 +1,26 @@
+
+SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+
+Copyright (c) 1992-2020 The FreeBSD Project.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
diff --git a/usr/src/contrib/bhyve/THIRDPARTYLICENSE.descrip b/usr/src/contrib/bhyve/THIRDPARTYLICENSE.descrip
new file mode 100644
index 0000000000..77026fc8a3
--- /dev/null
+++ b/usr/src/contrib/bhyve/THIRDPARTYLICENSE.descrip
@@ -0,0 +1 @@
+Bhyve hypervisor
diff --git a/usr/src/lib/libdiskmgt/common/findevs.c b/usr/src/lib/libdiskmgt/common/findevs.c
index 2ac0e6cada..53a0b121fb 100644
--- a/usr/src/lib/libdiskmgt/common/findevs.c
+++ b/usr/src/lib/libdiskmgt/common/findevs.c
@@ -28,6 +28,7 @@
  * Copyright (c) 2011 by Delphix. All rights reserved.
  * Copyright 2017 Nexenta Systems, Inc.
  * Copyright 2017 Joyent, Inc.
+ * Copyright 2020 Oxide Computer Company
  */
 
 #include <fcntl.h>
@@ -151,8 +152,23 @@ findevs(struct search_args *args)
 	args->controller_listp = NULL;
 	args->disk_listp = NULL;
 
+	args->ph = DI_PROM_HANDLE_NIL;
+	args->handle = DI_LINK_NIL;
 	args->dev_walk_status = 0;
-	args->handle = di_devlink_init(NULL, 0);
+
+	/*
+	 * Create device information library handles, which must be destroyed
+	 * before we return.
+	 */
+	if ((args->ph = di_prom_init()) == DI_PROM_HANDLE_NIL ||
+	    (args->handle = di_devlink_init(NULL, 0)) == DI_LINK_NIL) {
+		/*
+		 * We could not open all of the handles we need, so clean up
+		 * and report failure to the caller.
+		 */
+		args->dev_walk_status = errno;
+		goto cleanup;
+	}
 
 	/*
 	 * Have to make several passes at this with the new devfs caching.
@@ -160,7 +176,6 @@ findevs(struct search_args *args)
 	 * devices.
 	 */
 	di_root = di_init("/", DINFOCACHE);
-	args->ph = di_prom_init();
 	(void) di_walk_minor(di_root, NULL, 0, args, add_devs);
 	di_fini(di_root);
 
@@ -168,9 +183,16 @@ findevs(struct search_args *args)
 	(void) di_walk_minor(di_root, NULL, 0, args, add_devs);
 	di_fini(di_root);
 
-	(void) di_devlink_fini(&(args->handle));
-
 	clean_paths(args);
+
+cleanup:
+	if (args->ph != DI_PROM_HANDLE_NIL) {
+		di_prom_fini(args->ph);
+		args->ph = DI_PROM_HANDLE_NIL;
+	}
+	if (args->handle != DI_LINK_NIL) {
+		(void) di_devlink_fini(&(args->handle));
+	}
 }
 
 /*
diff --git a/usr/src/lib/libvmmapi/THIRDPARTYLICENSE b/usr/src/lib/libvmmapi/THIRDPARTYLICENSE
new file mode 100644
index 0000000000..66b39dc950
--- /dev/null
+++ b/usr/src/lib/libvmmapi/THIRDPARTYLICENSE
@@ -0,0 +1,26 @@
+
+SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+
+Copyright (c) 1992-2020 The FreeBSD Project.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
diff --git a/usr/src/lib/libvmmapi/THIRDPARTYLICENSE.descrip b/usr/src/lib/libvmmapi/THIRDPARTYLICENSE.descrip
new file mode 100644
index 0000000000..77026fc8a3
--- /dev/null
+++ b/usr/src/lib/libvmmapi/THIRDPARTYLICENSE.descrip
@@ -0,0 +1 @@
+Bhyve hypervisor
diff --git a/usr/src/pkg/manifests/system-bhyve.mf b/usr/src/pkg/manifests/system-bhyve.mf
index 002bef64cc..450f83954a 100644
--- a/usr/src/pkg/manifests/system-bhyve.mf
+++ b/usr/src/pkg/manifests/system-bhyve.mf
@@ -52,6 +52,8 @@ file path=usr/sbin/bhyvectl mode=0555
 file path=usr/sbin/pptadm mode=0555
 file path=usr/share/man/man1m/pptadm.1m
 license lic_CDDL license=lic_CDDL
+license usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE \
+    license=usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE
 depend fmri=developer/acpi type=require
 depend fmri=system/bhyve/firmware type=require
 depend fmri=system/library/bhyve type=require
diff --git a/usr/src/pkg/manifests/system-library-bhyve.mf b/usr/src/pkg/manifests/system-library-bhyve.mf
index 9af6e809cc..ce09f9deb0 100644
--- a/usr/src/pkg/manifests/system-library-bhyve.mf
+++ b/usr/src/pkg/manifests/system-library-bhyve.mf
@@ -31,3 +31,5 @@ file path=lib/$(ARCH64)/libvmmapi.so.1
 file path=usr/lib/$(ARCH64)/libppt.so.1
 file path=usr/lib/libppt.so.1
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/libvmmapi/THIRDPARTYLICENSE \
+    license=usr/src/lib/libvmmapi/THIRDPARTYLICENSE
diff --git a/usr/src/uts/common/fs/smbsrv/smb2_dispatch.c b/usr/src/uts/common/fs/smbsrv/smb2_dispatch.c
index afe8d04013..9aafb6e4d7 100644
--- a/usr/src/uts/common/fs/smbsrv/smb2_dispatch.c
+++ b/usr/src/uts/common/fs/smbsrv/smb2_dispatch.c
@@ -1492,8 +1492,7 @@ smb2_send_reply(smb_request_t *sr)
 
 	if ((session->capabilities & SMB2_CAP_ENCRYPTION) == 0 ||
 	    sr->tform_ssn == NULL) {
-		if (smb_session_send(sr->session, 0, &sr->reply) == 0)
-			sr->reply.chain = 0;
+		(void) smb_session_send(sr->session, 0, &sr->reply);
 		return;
 	}
 
@@ -1518,8 +1517,8 @@ smb2_send_reply(smb_request_t *sr)
 		goto errout;
 	}
 
-	if (smb_session_send(sr->session, 0, &enc_reply) == 0)
-		enc_reply.chain = 0;
+	(void) smb_session_send(sr->session, 0, &enc_reply);
+	kmem_free(tmpbuf, buflen);
 	return;
 
 errout:
diff --git a/usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE b/usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE
new file mode 100644
index 0000000000..66b39dc950
--- /dev/null
+++ b/usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE
@@ -0,0 +1,26 @@
+
+SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+
+Copyright (c) 1992-2020 The FreeBSD Project.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
diff --git a/usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE.descrip b/usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE.descrip
new file mode 100644
index 0000000000..77026fc8a3
--- /dev/null
+++ b/usr/src/uts/i86pc/io/viona/THIRDPARTYLICENSE.descrip
@@ -0,0 +1 @@
+Bhyve hypervisor
diff --git a/usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE b/usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE
new file mode 100644
index 0000000000..66b39dc950
--- /dev/null
+++ b/usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE
@@ -0,0 +1,26 @@
+
+SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+
+Copyright (c) 1992-2020 The FreeBSD Project.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
diff --git a/usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE.descrip b/usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE.descrip
new file mode 100644
index 0000000000..77026fc8a3
--- /dev/null
+++ b/usr/src/uts/i86pc/io/vmm/THIRDPARTYLICENSE.descrip
@@ -0,0 +1 @@
+Bhyve hypervisor
diff --git a/usr/src/uts/i86pc/io/vmm/vmm.c b/usr/src/uts/i86pc/io/vmm/vmm.c
index b42bd733d5..579ca12e84 100644
--- a/usr/src/uts/i86pc/io/vmm/vmm.c
+++ b/usr/src/uts/i86pc/io/vmm/vmm.c
@@ -1132,8 +1132,10 @@ vm_gpa_hold(struct vm *vm, int vcpuid, vm_paddr_t gpa, size_t len, int reqprot,
 	count = 0;
 	for (i = 0; i < VM_MAX_MEMMAPS; i++) {
 		mm = &vm->mem_maps[i];
-		if (sysmem_mapping(vm, mm) && gpa >= mm->gpa &&
-		    gpa < mm->gpa + mm->len) {
+		if (mm->len == 0) {
+			continue;
+		}
+		if (gpa >= mm->gpa && gpa < mm->gpa + mm->len) {
 			count = vm_fault_quick_hold_pages(&vm->vmspace->vm_map,
 			    trunc_page(gpa), PAGE_SIZE, reqprot, &m, 1);
 			break;
diff --git a/usr/src/uts/intel/io/intel_nb5000/intel_nb5000.c b/usr/src/uts/intel/io/intel_nb5000/intel_nb5000.c
index d1d4b6d427..4d5dbc5c9e 100644
--- a/usr/src/uts/intel/io/intel_nb5000/intel_nb5000.c
+++ b/usr/src/uts/intel/io/intel_nb5000/intel_nb5000.c
@@ -280,6 +280,7 @@ nf_memory_error(const nb_regs_t *rp, void *data)
 			sp->channel = -1;
 			if (nb_mode != NB_MEMORY_MIRROR) {
 				recmema = rp->nb.nf_fbd_regs.recmema;
+				recmemb = rp->nb.nf_fbd_regs.recmemb;
 				sp->rank = (recmema >> 8) & RANK_MASK;
 				sp->bank = (recmema >> 12) & BANK_MASK;
 				sp->cas = (recmemb >> 16) & CAS_MASK;
@@ -2165,6 +2166,8 @@ nb_drain(void *ignored, const void *data, const errorq_elem_t *eqe)
 	char buf[FM_MAX_CLASS];
 	nb_scatchpad_t nb_scatchpad;
 
+	eqep = NULL;
+	scr_eqep = NULL;
 	if (panicstr) {
 		if ((eqep = errorq_reserve(ereport_errorq)) == NULL)
 			return;