From owner-cvs-all@FreeBSD.ORG  Tue Jan 20 14:45:12 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 29A4116A4CE; Tue, 20 Jan 2004 14:45:12 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id CB12643D5C; Tue, 20 Jan 2004 14:45:10 -0800 (PST)
	(envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0KMjA0B027538;
	Tue, 20 Jan 2004 14:45:10 -0800 (PST)
	(envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0KMjA0W027537;
	Tue, 20 Jan 2004 14:45:10 -0800 (PST)
	(envelope-from sam)
Message-Id: <200401202245.i0KMjA0W027537@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Tue, 20 Jan 2004 14:45:10 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/netipsec ipsec_output.c xform_ipip.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2004 22:45:12 -0000

sam         2004/01/20 14:45:10 PST

  FreeBSD src repository

  Modified files:
    sys/netipsec         ipsec_output.c xform_ipip.c 
  Log:
  Fix ipip_output() to always set *mp to NULL on failure, even if 'm'
  is NULL, otherwise ipsec4_process_packet() may try to m_freem() a
  bad pointer.
  
  In ipsec4_process_packet(), don't try to m_freem() 'm' twice; ipip_output()
  already did it.
  
  Obtained from:  netbsd
  
  Revision  Changes    Path
  1.10      +4 -1      src/sys/netipsec/ipsec_output.c
  1.7       +2 -2      src/sys/netipsec/xform_ipip.c