Fix leaks in probestart, probedone, and scsi_scan_bus. Also free

page_list using the matching malloc type for the allocation.

Approved by:	re
Reviewed by:	scottl [1]
MFC after:	1 week

[1] Original patch was against xpt_cam.c, prior to the cam refactoring.

1 files changed, 8 insertions, 3 deletions

diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c
index 8fcb457c..07bef62 100644
--- a/sys/cam/scsi/scsi_xpt.c
+++ b/sys/cam/scsi/scsi_xpt.c
@@ -836,8 +836,11 @@ probestart(struct cam_periph *periph, union ccb *start_ccb)
 
 		serial_buf = NULL;
 		device = periph->path->device;
-		device->serial_num = NULL;
-		device->serial_num_len = 0;
+		if (device->serial_num != NULL) {
+			free(device->serial_num, M_CAMXPT);
+			device->serial_num = NULL;
+			device->serial_num_len = 0;
+		}
 
 		serial_buf = (struct scsi_vpd_unit_serial_number *)
 			malloc(sizeof(*serial_buf), M_CAMXPT, M_NOWAIT|M_ZERO);
@@ -1176,7 +1179,7 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
 		}
 
 		if (page_list != NULL)
-			free(page_list, M_DEVBUF);
+			free(page_list, M_CAMXPT);
 
 		if (serialnum_supported) {
 			xpt_release_ccb(done_ccb);
@@ -1561,6 +1564,7 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 			}
 			work_ccb = xpt_alloc_ccb_nowait();
 			if (work_ccb == NULL) {
+				xpt_free_ccb((union ccb *)scan_info->cpi);
 				free(scan_info, M_CAMXPT);
 				xpt_free_path(path);
 				request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
@@ -1682,6 +1686,7 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 			}
 
 			if ((scan_info->cpi->hba_misc & PIM_SEQSCAN) == 0) {
+				xpt_free_ccb(request_ccb);
 				break;
 			}
 			status = xpt_create_path(&path, xpt_periph,