svn commit: r216125 - stable/7/sys/netinet

[Bjoern A. Zeeb]

Author: bz
Date: Thu Dec  2 16:27:28 2010
New Revision: 216125
URL: http://svn.freebsd.org/changeset/base/216125

Log:
  MFC r206989:
  
    Avoid memory access after free. Use the (shortend) copy for the
    ipsec mtu lookup as well.
  
    Submitted by:	Peter Molnar (peter molnar.cc)
  PR:		kern/145736
  Approved by:	re (kib)

Modified:
  stable/7/sys/netinet/ip_input.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/netinet/ip_input.c
==============================================================================
--- stable/7/sys/netinet/ip_input.c	Thu Dec  2 15:59:41 2010	(r216124)
+++ stable/7/sys/netinet/ip_input.c	Thu Dec  2 16:27:28 2010	(r216125)
@@ -1404,7 +1404,7 @@ ip_forward(struct mbuf *m, int srcrt)
 		 * If IPsec is configured for this path,
 		 * override any possibly mtu value set by ip_output.
 		 */ 
-		mtu = ip_ipsec_mtu(m, mtu);
+		mtu = ip_ipsec_mtu(mcopy, mtu);
 #endif /* IPSEC */
 		/*
 		 * If the MTU was set before make sure we are below the