From owner-cvs-src-old@FreeBSD.ORG  Sat Apr  9 11:03:32 2011
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C0A9A1065670
	for <cvs-src-old@freebsd.org>; Sat,  9 Apr 2011 11:03:32 +0000 (UTC)
	(envelope-from bz@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AD01B8FC08
	for <cvs-src-old@freebsd.org>; Sat,  9 Apr 2011 11:03:32 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p39B3W8e048438
	for <cvs-src-old@freebsd.org>; Sat, 9 Apr 2011 11:03:32 GMT
	(envelope-from bz@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p39B3Wku048437
	for cvs-src-old@freebsd.org; Sat, 9 Apr 2011 11:03:32 GMT
	(envelope-from bz@repoman.freebsd.org)
Message-Id: <201104091103.p39B3Wku048437@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	bz@repoman.freebsd.org using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 9 Apr 2011 11:03:04 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_6
Subject: cvs commit: src/sys/netinet6 ipcomp_input.c src/sys/netipsec
 xform_ipcomp.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Apr 2011 11:03:32 -0000

bz          2011-04-09 11:03:04 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/netinet6         ipcomp_input.c 
    sys/netipsec         xform_ipcomp.c 
  Log:
  SVN rev 220485 on 2011-04-09 11:03:04Z by bz
  
  MFC r220247:
  
    Do not allow directly recursive RFC3173 IPComp payload.
  
    While IPv6 does count iterations over next headers in ip6_input,
    we still disallow directly recursive IPComp payload in the KAME code.
  
  Security:       CVE-2011-1547
  
  Revision  Changes    Path
  1.8.2.2   +26 -1     src/sys/netinet6/ipcomp_input.c
  1.8.2.8   +21 -0     src/sys/netipsec/xform_ipcomp.c