svn commit: r261451 - stable/9/sys/cam

Alexander Motin mav at FreeBSD.org
Tue Feb 4 00:52:08 UTC 2014


Author: mav
Date: Tue Feb  4 00:52:08 2014
New Revision: 261451
URL: http://svnweb.freebsd.org/changeset/base/261451

Log:
  MFC r260996:
  Fix memory and references leak due to unfreed path in case we can't
  allocate bus scan CCB.

Modified:
  stable/9/sys/cam/cam_xpt.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/cam_xpt.c
==============================================================================
--- stable/9/sys/cam/cam_xpt.c	Tue Feb  4 00:51:06 2014	(r261450)
+++ stable/9/sys/cam/cam_xpt.c	Tue Feb  4 00:52:08 2014	(r261451)
@@ -3982,9 +3982,11 @@ xpt_bus_register(struct cam_sim *sim, de
 				scan_ccb->ccb_h.func_code = XPT_SCAN_BUS;
 				scan_ccb->crcn.flags = 0;
 				xpt_rescan(scan_ccb);
-			} else
+			} else {
 				xpt_print(path,
 					  "Can't allocate CCB to scan bus\n");
+				xpt_free_path(path);
+			}
 		} else
 			xpt_free_path(path);
 	} else


More information about the svn-src-stable-9 mailing list