summaryrefslogtreecommitdiffstats
path: root/sys/netinet/tcp_subr.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-07-28 19:58:44 +0000
committerdelphij <delphij@FreeBSD.org>2015-07-28 19:58:44 +0000
commitd3ecbb901935c309843d4d32e0c467e20eea8958 (patch)
treecd53033984168fc2087077ececf72787bc246d24 /sys/netinet/tcp_subr.c
parent87ad559404a19eaa8260bddc37528dfcec7df737 (diff)
downloadFreeBSD-src-d3ecbb901935c309843d4d32e0c467e20eea8958.zip
FreeBSD-src-d3ecbb901935c309843d4d32e0c467e20eea8958.tar.gz
Fix patch(1) shell injection vulnerability. [SA-15:14]
Fix resource exhaustion in TCP reassembly. [SA-15:15] Fix OpenSSH multiple vulnerabilities. [SA-15:16]
Diffstat (limited to 'sys/netinet/tcp_subr.c')
-rw-r--r--sys/netinet/tcp_subr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index cbc6239..ba2d834 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -376,7 +376,6 @@ tcp_init(void)
tcp_tw_init();
syncache_init();
tcp_hc_init();
- tcp_reass_init();
TUNABLE_INT_FETCH("net.inet.tcp.sack.enable", &V_tcp_do_sack);
V_sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole),
@@ -386,6 +385,8 @@ tcp_init(void)
if (!IS_DEFAULT_VNET(curvnet))
return;
+ tcp_reass_global_init();
+
/* XXX virtualize those bellow? */
tcp_delacktime = TCPTV_DELACK;
tcp_keepinit = TCPTV_KEEP_INIT;
@@ -433,7 +434,6 @@ void
tcp_destroy(void)
{
- tcp_reass_destroy();
tcp_hc_destroy();
syncache_destroy();
tcp_tw_destroy();
OpenPOWER on IntegriCloud