From owner-svn-src-all@FreeBSD.ORG  Wed Oct 22 14:58:23 2008
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 84CE81065670;
	Wed, 22 Oct 2008 14:58:23 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7290A8FC1F;
	Wed, 22 Oct 2008 14:58:23 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9MEwNG3031511;
	Wed, 22 Oct 2008 14:58:23 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9MEwNMX031510;
	Wed, 22 Oct 2008 14:58:23 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200810221458.m9MEwNMX031510@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 22 Oct 2008 14:58:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184163 - in releng/6.4/sys: . netinet6
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: Wed, 22 Oct 2008 14:58:23 -0000

Author: bz
Date: Wed Oct 22 14:58:23 2008
New Revision: 184163
URL: http://svn.freebsd.org/changeset/base/184163

Log:
  MFC: r183923
  
    Check that the mbuf len is positive (like we do in the v4 case)
    to avoid possible panics.
  
  PR:		kern/119123
  Approved by:	re (kib)

Modified:
  releng/6.4/sys/   (props changed)
  releng/6.4/sys/netinet6/ip6_output.c

Modified: releng/6.4/sys/netinet6/ip6_output.c
==============================================================================
--- releng/6.4/sys/netinet6/ip6_output.c	Wed Oct 22 14:56:15 2008	(r184162)
+++ releng/6.4/sys/netinet6/ip6_output.c	Wed Oct 22 14:58:23 2008	(r184163)
@@ -2979,7 +2979,7 @@ ip6_setpktopts(control, opt, stickyopt, 
 	if (control->m_next)
 		return (EINVAL);
 
-	for (; control->m_len; control->m_data += CMSG_ALIGN(cm->cmsg_len),
+	for (; control->m_len > 0; control->m_data += CMSG_ALIGN(cm->cmsg_len),
 	    control->m_len -= CMSG_ALIGN(cm->cmsg_len)) {
 		int error;