From owner-svn-src-head@FreeBSD.ORG  Mon Nov 15 22:05:08 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 712CC106566B;
	Mon, 15 Nov 2010 22:05:08 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F99A8FC1B;
	Mon, 15 Nov 2010 22:05:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAFM581P030119;
	Mon, 15 Nov 2010 22:05:08 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAFM58Rf030117;
	Mon, 15 Nov 2010 22:05:08 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201011152205.oAFM58Rf030117@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Mon, 15 Nov 2010 22:05:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215350 - head/sys/dev/nfe
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Nov 2010 22:05:08 -0000

Author: yongari
Date: Mon Nov 15 22:05:08 2010
New Revision: 215350
URL: http://svn.freebsd.org/changeset/base/215350

Log:
  Plug memory leakage introduced in r215327.
  
  Submitted by:	jkim

Modified:
  head/sys/dev/nfe/if_nfe.c

Modified: head/sys/dev/nfe/if_nfe.c
==============================================================================
--- head/sys/dev/nfe/if_nfe.c	Mon Nov 15 21:58:10 2010	(r215349)
+++ head/sys/dev/nfe/if_nfe.c	Mon Nov 15 22:05:08 2010	(r215350)
@@ -804,7 +804,7 @@ nfe_can_use_msix(struct nfe_softc *sc)
 
 	struct msix_blacklist *mblp;
 	char *maker, *product;
-	int count, n;
+	int count, n, use_msix;
 
 	/*
 	 * Search base board manufacturer and product name table
@@ -812,18 +812,25 @@ nfe_can_use_msix(struct nfe_softc *sc)
 	 */
 	maker = getenv("smbios.planar.maker");
 	product = getenv("smbios.planar.product");
+	use_msix = 1;
 	if (maker != NULL && product != NULL) {
 		count = sizeof(msix_blacklists) / sizeof(msix_blacklists[0]);
 		mblp = msix_blacklists;
 		for (n = 0; n < count; n++) {
 			if (strcmp(maker, mblp->maker) == 0 &&
-			    strcmp(product, mblp->product) == 0)
-				return (0);
+			    strcmp(product, mblp->product) == 0) {
+				use_msix = 0;
+				break;
+			}
 			mblp++;
 		}
 	}
+	if (maker != NULL)
+		freeenv(maker);
+	if (product != NULL)
+		freeenv(product);
 
-	return (1);
+	return (use_msix);
 }