Date: Tue, 19 Jun 2018 05:28:15 +0000 (UTC) From: Randall Stewart <rrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335361 - head/sys/netinet Message-ID: <201806190528.w5J5SFYh038597@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rrs Date: Tue Jun 19 05:28:14 2018 New Revision: 335361 URL: https://svnweb.freebsd.org/changeset/base/335361 Log: Move the tp set back to where it was before we started playing with the VNET sets. This way we have verified the INP settings before we go to the trouble of de-referencing it. Reviewed by: and suggested by lstewart Sponsored by: Netflix Inc. Modified: head/sys/netinet/tcp_hpts.c Modified: head/sys/netinet/tcp_hpts.c ============================================================================== --- head/sys/netinet/tcp_hpts.c Tue Jun 19 05:01:07 2018 (r335360) +++ head/sys/netinet/tcp_hpts.c Tue Jun 19 05:28:14 2018 (r335361) @@ -1158,7 +1158,6 @@ tcp_input_data(struct tcp_hpts_entry *hpts, struct tim hpts->p_inp = inp; drop_reason = inp->inp_hpts_drop_reas; inp->inp_in_input = 0; - tp = intotcpcb(inp); mtx_unlock(&hpts->p_mtx); CURVNET_SET(inp->inp_vnet); if (drop_reason) { @@ -1183,6 +1182,7 @@ out: mtx_lock(&hpts->p_mtx); continue; } + tp = intotcpcb(inp); if ((tp == NULL) || (tp->t_inpcb == NULL)) { goto out; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806190528.w5J5SFYh038597>