summaryrefslogtreecommitdiffstats
path: root/sys/netinet6
diff options
context:
space:
mode:
authorae <ae@FreeBSD.org>2014-11-20 18:49:11 +0000
committerae <ae@FreeBSD.org>2014-11-20 18:49:11 +0000
commitb634635a73c9af335c794449b95fa6c02663e42a (patch)
tree06147572ea2d690b79a67d3d15b531d01d0db0fa /sys/netinet6
parent84d8d047ba855b0e24f1009141363b9d5e1dcf29 (diff)
downloadFreeBSD-src-b634635a73c9af335c794449b95fa6c02663e42a.zip
FreeBSD-src-b634635a73c9af335c794449b95fa6c02663e42a.tar.gz
MFC r274434:
Fix ips_out_nosa errors accounting. MFC r274454: ipsec6_process_packet is called before ip6_output fixes ip6_plen. Update ip6_plen before bpf processing to be able see correct value. MFC r274455: We don't return sp pointer, thus NULL assignment isn't needed. And reference to sp will be freed at the end. MFC r274465: Remove redundant ip6_plen initialization. MFC r274466: Strip IP header only when we act in tunnel mode. MFC r274467: Count statistics for the specific address family. Sponsored by: Yandex LLC
Diffstat (limited to 'sys/netinet6')
-rw-r--r--sys/netinet6/ip6_ipsec.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/netinet6/ip6_ipsec.c b/sys/netinet6/ip6_ipsec.c
index 6109d86..2509e09 100644
--- a/sys/netinet6/ip6_ipsec.c
+++ b/sys/netinet6/ip6_ipsec.c
@@ -272,11 +272,7 @@ ip6_ipsec_output(struct mbuf **m, struct inpcb *inp, int *flags, int *error,
/*
* No IPsec processing is needed, free
* reference to SP.
- *
- * NB: null pointer to avoid free at
- * done: below.
*/
- KEY_FREESP(&sp), sp = NULL;
goto done;
}
}
OpenPOWER on IntegriCloud