d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When initializing the TCP FO client cookie cache, take into account

Browse Source 
whether the TCP FO support is enabled or not for the client side.

The code in tcp_fastopen_init() implicitly assumed that the sysctl
variable V_tcp_fastopen_client_enable was initialized to 0. This
was initially true, but was changed in r335610, which unmasked this
bug.

Thanks to Pieter de Goeje for reporting the issue on freebsd-net@
This commit is contained in:
Michael Tuexen 2018-07-07 11:18:26 +00:00
parent fedd55f14b
commit c556884f8e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=336057
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netinet/tcp_fastopen.c
View File

@ -408,7 +408,13 @@ tcp_fastopen_init(void)
TAILQ_INIT(&V_tcp_fastopen_ccache.base[i].ccb_entries);
mtx_init(&V_tcp_fastopen_ccache.base[i].ccb_mtx, "tfo_ccache_bucket",
NULL, MTX_DEF);
V_tcp_fastopen_ccache.base[i].ccb_num_entries = -1; /* bucket disabled */
if (V_tcp_fastopen_client_enable) {
/* enable bucket */
V_tcp_fastopen_ccache.base[i].ccb_num_entries = 0;
} else {
/* disable bucket */
V_tcp_fastopen_ccache.base[i].ccb_num_entries = -1;
}
V_tcp_fastopen_ccache.base[i].ccb_ccache = &V_tcp_fastopen_ccache;
}
@ -824,6 +830,9 @@ sysctl_net_inet_tcp_fastopen_client_enable(SYSCTL_HANDLER_ARGS)
/* enabled -> disabled */
for (i = 0; i < V_tcp_fastopen_ccache.buckets; i++) {
ccb = &V_tcp_fastopen_ccache.base[i];
KASSERT(ccb->ccb_num_entries > -1,
("%s: ccb->ccb_num_entries %d is negative",
__func__, ccb->ccb_num_entries));
tcp_fastopen_ccache_bucket_trim(ccb, 0);
}
V_tcp_fastopen_client_enable = 0;