svn commit: r198711 - in stable/8/sys: . amd64/include/xen cam/scsi cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci

[Christian Brueffer]

Author: brueffer
Date: Sat Oct 31 11:08:04 2009
New Revision: 198711
URL: http://svn.freebsd.org/changeset/base/198711

Log:
  MFC: r198356
  
  Fix a memory leak in an error case.

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cam/scsi/scsi_low.c
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/cam/scsi/scsi_low.c
==============================================================================
--- stable/8/sys/cam/scsi/scsi_low.c	Sat Oct 31 10:59:53 2009	(r198710)
+++ stable/8/sys/cam/scsi/scsi_low.c	Sat Oct 31 11:08:04 2009	(r198711)
@@ -638,7 +638,10 @@ scsi_low_attach_xs(slp)
 		return ENOMEM;
 	splp = SCSI_LOW_MALLOC(sizeof(*splp));
 	if (splp == NULL)
+	{
+		SCSI_LOW_FREE(sap);
 		return ENOMEM;
+	}
 
 	SCSI_LOW_BZERO(sap, sizeof(*sap));
 	SCSI_LOW_BZERO(splp, sizeof(*splp));