From owner-svn-src-head@FreeBSD.ORG  Mon Apr 29 23:08:14 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 17369F86;
 Mon, 29 Apr 2013 23:08:14 +0000 (UTC)
 (envelope-from gibbs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 096E41D9F;
 Mon, 29 Apr 2013 23:08:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3TN8DvV034101;
 Mon, 29 Apr 2013 23:08:13 GMT (envelope-from gibbs@svn.freebsd.org)
Received: (from gibbs@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3TN8Dlj034100;
 Mon, 29 Apr 2013 23:08:13 GMT (envelope-from gibbs@svn.freebsd.org)
Message-Id: <201304292308.r3TN8Dlj034100@svn.freebsd.org>
From: "Justin T. Gibbs" <gibbs@FreeBSD.org>
Date: Mon, 29 Apr 2013 23:08:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250081 - head/sys/xen/xenstore
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 29 Apr 2013 23:08:14 -0000

Author: gibbs
Date: Mon Apr 29 23:08:13 2013
New Revision: 250081
URL: http://svnweb.freebsd.org/changeset/base/250081

Log:
  xenstore/xenstore.c:
  	Prevent access to invalid memory region when listing an empty
  	directory in the XenStore.
  
  Reported by:	Bei Guan
  MFC after:	1 week

Modified:
  head/sys/xen/xenstore/xenstore.c

Modified: head/sys/xen/xenstore/xenstore.c
==============================================================================
--- head/sys/xen/xenstore/xenstore.c	Mon Apr 29 22:54:26 2013	(r250080)
+++ head/sys/xen/xenstore/xenstore.c	Mon Apr 29 23:08:13 2013	(r250081)
@@ -307,7 +307,8 @@ split(char *strings, u_int len, u_int *n
 	const char **ret;
 
 	/* Protect against unterminated buffers. */
-	strings[len - 1] = '\0';
+	if (len > 0)
+		strings[len - 1] = '\0';
 
 	/* Count the strings. */
 	*num = extract_strings(strings, /*dest*/NULL, len);