From owner-svn-src-all@freebsd.org  Mon May 16 04:39:17 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id ABBFAB3C265;
 Mon, 16 May 2016 04:39:17 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 78F1111E4;
 Mon, 16 May 2016 04:39:17 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4G4dG2s026288;
 Mon, 16 May 2016 04:39:16 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4G4dGK5026287;
 Mon, 16 May 2016 04:39:16 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201605160439.u4G4dGK5026287@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis <truckman@FreeBSD.org>
Date: Mon, 16 May 2016 04:39:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299893 - head/usr.sbin/config
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 May 2016 04:39:17 -0000

Author: truckman
Date: Mon May 16 04:39:16 2016
New Revision: 299893
URL: https://svnweb.freebsd.org/changeset/base/299893

Log:
  Don't free fnamebuf before we calling cfgfile_add().  This changes a
  use-after-free error into a minor memory leak.
  
  Reported by:	Coverity
  CID:		1006084

Modified:
  head/usr.sbin/config/lang.l

Modified: head/usr.sbin/config/lang.l
==============================================================================
--- head/usr.sbin/config/lang.l	Mon May 16 04:03:52 2016	(r299892)
+++ head/usr.sbin/config/lang.l	Mon May 16 04:39:16 2016	(r299893)
@@ -267,7 +267,8 @@ include(const char *fname, int ateof)
 		asprintf(&fnamebuf, "../../conf/%s", fname);
 		if (fnamebuf != NULL) {
 			fp = fopen(fnamebuf, "r");
-			free(fnamebuf);
+			if (fp == NULL)
+				free(fnamebuf);
 		}
 	}
 	if (fp == NULL) {
@@ -275,10 +276,10 @@ include(const char *fname, int ateof)
 			asprintf(&fnamebuf, "%s/%s", ipath->path, fname);
 			if (fnamebuf != NULL) {
 				fp = fopen(fnamebuf, "r");
-				free(fnamebuf);
 			}
 			if (fp != NULL)
 				break;
+			free(fnamebuf);
 		}
 	}
 	if (fp == NULL) {