From owner-svn-src-stable@FreeBSD.ORG  Wed May 27 11:03:15 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 52BAF10656A5;
	Wed, 27 May 2009 11:03:15 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E60A8FC15;
	Wed, 27 May 2009 11:03:15 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RB3FRb094988;
	Wed, 27 May 2009 11:03:15 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4RB3Fmf094987;
	Wed, 27 May 2009 11:03:15 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <200905271103.n4RB3Fmf094987@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Wed, 27 May 2009 11:03:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192889 - in stable/7/sys: . compat/ndis contrib/pf
	dev/ath/ath_hal dev/cxgb
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 May 2009 11:03:16 -0000

Author: brueffer
Date: Wed May 27 11:03:14 2009
New Revision: 192889
URL: http://svn.freebsd.org/changeset/base/192889

Log:
  MFC: r192036
  
  Fix memory leak in an error case.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/ndis/kern_windrv.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/compat/ndis/kern_windrv.c
==============================================================================
--- stable/7/sys/compat/ndis/kern_windrv.c	Wed May 27 10:27:14 2009	(r192888)
+++ stable/7/sys/compat/ndis/kern_windrv.c	Wed May 27 11:03:14 2009	(r192889)
@@ -527,7 +527,10 @@ windrv_bus_attach(drv, name)
 
 	RtlInitAnsiString(&as, name);
 	if (RtlAnsiStringToUnicodeString(&drv->dro_drivername, &as, TRUE))
+	{
+		free(new, M_DEVBUF);
 		return(ENOMEM);
+	}
 
 	/*
 	 * Set up a fake image pointer to avoid false matches