From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 15 13:03:26 2011
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 0000D106564A;
	Sat, 15 Oct 2011 13:03:25 +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 E33E78FC12;
	Sat, 15 Oct 2011 13:03:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9FD3Pkn014859;
	Sat, 15 Oct 2011 13:03:25 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9FD3PQM014857;
	Sat, 15 Oct 2011 13:03:25 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201110151303.p9FD3PQM014857@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Sat, 15 Oct 2011 13:03:25 +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: r226392 - stable/8/sys/netipsec
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: Sat, 15 Oct 2011 13:03:26 -0000

Author: brueffer
Date: Sat Oct 15 13:03:25 2011
New Revision: 226392
URL: http://svn.freebsd.org/changeset/base/226392

Log:
  MFC: r226117
  
  Add missing va_end() in an error case to clean up after va_start()
  (already done in the non-error case).

Modified:
  stable/8/sys/netipsec/key.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/netipsec/key.c
==============================================================================
--- stable/8/sys/netipsec/key.c	Sat Oct 15 12:59:30 2011	(r226391)
+++ stable/8/sys/netipsec/key.c	Sat Oct 15 13:03:25 2011	(r226392)
@@ -1763,6 +1763,7 @@ key_gather_mbuf(m, mhp, ndeep, nitem, va
 
 fail:
 	m_freem(result);
+	va_end(ap);
 	return NULL;
 }