From owner-svn-src-all@FreeBSD.ORG  Mon Jul 19 19:52:03 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2BB5D106566C;
	Mon, 19 Jul 2010 19:52:03 +0000 (UTC)
	(envelope-from jamie@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1956D8FC1D;
	Mon, 19 Jul 2010 19:52:03 +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 o6JJq3BL065853;
	Mon, 19 Jul 2010 19:52:03 GMT (envelope-from jamie@svn.freebsd.org)
Received: (from jamie@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6JJq2px065851;
	Mon, 19 Jul 2010 19:52:03 GMT (envelope-from jamie@svn.freebsd.org)
Message-Id: <201007191952.o6JJq2px065851@svn.freebsd.org>
From: Jamie Gritton <jamie@FreeBSD.org>
Date: Mon, 19 Jul 2010 19:52:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210252 - stable/8/lib/libjail
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jul 2010 19:52:03 -0000

Author: jamie
Date: Mon Jul 19 19:52:02 2010
New Revision: 210252
URL: http://svn.freebsd.org/changeset/base/210252

Log:
  MFC r210134:
  
    Don't copy and return a potentially unset buffer when jail_get fails.

Modified:
  stable/8/lib/libjail/jail_getid.c
Directory Properties:
  stable/8/lib/libjail/   (props changed)

Modified: stable/8/lib/libjail/jail_getid.c
==============================================================================
--- stable/8/lib/libjail/jail_getid.c	Mon Jul 19 19:51:17 2010	(r210251)
+++ stable/8/lib/libjail/jail_getid.c	Mon Jul 19 19:52:02 2010	(r210252)
@@ -94,11 +94,15 @@ jail_getname(int jid)
 	jiov[5].iov_len = JAIL_ERRMSGLEN;
 	jail_errmsg[0] = 0;
 	jid = jail_get(jiov, 6, 0);
-	if (jid < 0 && !jail_errmsg[0])
-		snprintf(jail_errmsg, JAIL_ERRMSGLEN, "jail_get: %s",
-		    strerror(errno));
-	name = strdup(namebuf);
-	if (name == NULL)
-		strerror_r(errno, jail_errmsg, JAIL_ERRMSGLEN);
+	if (jid < 0) {
+		if (!jail_errmsg[0])
+			snprintf(jail_errmsg, JAIL_ERRMSGLEN, "jail_get: %s",
+			    strerror(errno));
+		return NULL;
+	} else {
+		name = strdup(namebuf);
+		if (name == NULL)
+			strerror_r(errno, jail_errmsg, JAIL_ERRMSGLEN);
+	}
 	return name;
 }