changeset 11731:2050b360ab01

6920383 scsi_vhci panic in vhci_tpgs_inquiry:: NULL pointer dereference
author Chris Liu <Chris.Liu@Sun.COM>
date Mon, 22 Feb 2010 11:30:05 +0800
parents 1d9187deede6
children ee26ced274e2
files usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci_tpgs.c
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci_tpgs.c	Mon Feb 22 09:39:28 2010 +0800
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci_tpgs.c	Mon Feb 22 11:30:05 2010 +0800
@@ -259,6 +259,11 @@
 
 	pkt = scsi_init_pkt(ap, NULL, bp, CDB_GROUP0,
 	    sizeof (struct scsi_arq_status), 0, 0, SLEEP_FUNC, NULL);
+	if (pkt == NULL) {
+		VHCI_DEBUG(1, (CE_WARN, NULL,
+		    "!vhci_tpgs_inquiry: Failure returned from scsi_init_pkt"));
+		return (1);
+	}
 	pkt->pkt_cdbp[0] = SCMD_INQUIRY;
 	pkt->pkt_cdbp[4] = sizeof (inq);
 	pkt->pkt_time = 60;