Module Name: src
Committed By: snj
Date: Tue Jan 9 19:30:45 UTC 2018
Modified Files:
src/sys/netinet6 [netbsd-8]: ip6_forward.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #484):
sys/netinet6/ip6_forward.c: 1.89-1.90
Fix use-after-free of mbuf by ip6flow_create
This fixes recent failures of some ATF tests such as t_ipsec_tunnel_odd.
--
Fix use-after-free of mbuf by ip6flow_create (one more)
To generate a diff of this commit:
cvs rdiff -u -r1.87.2.1 -r1.87.2.2 src/sys/netinet6/ip6_forward.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/ip6_forward.c
diff -u src/sys/netinet6/ip6_forward.c:1.87.2.1 src/sys/netinet6/ip6_forward.c:1.87.2.2
--- src/sys/netinet6/ip6_forward.c:1.87.2.1 Sat Oct 21 19:43:54 2017
+++ src/sys/netinet6/ip6_forward.c Tue Jan 9 19:30:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_forward.c,v 1.87.2.1 2017/10/21 19:43:54 snj Exp $ */
+/* $NetBSD: ip6_forward.c,v 1.87.2.2 2018/01/09 19:30:45 snj Exp $ */
/* $KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.87.2.1 2017/10/21 19:43:54 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.87.2.2 2018/01/09 19:30:45 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -415,8 +415,8 @@ ip6_forward(struct mbuf *m, int srcrt)
/* Need to release rt here */
rtcache_unref(rt, ro);
rt = NULL;
- if (m->m_flags & M_CANFASTFWD)
- ip6flow_create(ro, m);
+ if (mcopy->m_flags & M_CANFASTFWD)
+ ip6flow_create(ro, mcopy);
#endif
if (mcopy)
goto freecopy;
