upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure that the INP lock is released before leaving [gs]etsockopt()

Browse source 
for RACK specific socket options.
These issues were found by a syzkaller instance.
Reviewed by:		rrs@
Sponsored by:		Netflix, Inc.
Differential Revision:	https://reviews.freebsd.org/D21825
This commit is contained in:
Michael Tuexen 2019-09-28 13:05:37 +00:00
parent d12c5ef640
commit 79c2a2a07b
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/netinet/tcp_stacks/rack.c
View file

@ -10261,10 +10261,10 @@ rack_set_sockopt(struct socket *so, struct sockopt *sopt,
break;
case TCP_RACK_TLP_INC_VAR:
/* Does TLP include rtt variance in t-o */
return (EINVAL);
error = EINVAL;
break;
case TCP_RACK_IDLE_REDUCE_HIGH:
return (EINVAL);
error = EINVAL;
break;
case TCP_DELACK:
if (optval == 0)
@ -10329,6 +10329,7 @@ rack_get_sockopt(struct socket *so, struct sockopt *sopt,
* add a option that is not a int, then this will have quite an
* impact to this routine.
*/
error = 0;
switch (sopt->sopt_name) {
case TCP_RACK_DO_DETECTION:
optval = rack->do_detection;
@ -10398,10 +10399,10 @@ rack_get_sockopt(struct socket *so, struct sockopt *sopt,
break;
case TCP_RACK_TLP_INC_VAR:
/* Does TLP include rtt variance in t-o */
return (EINVAL);
error = EINVAL;
break;
case TCP_RACK_IDLE_REDUCE_HIGH:
return (EINVAL);
error = EINVAL;
break;
case TCP_RACK_MIN_PACE:
optval = rack->r_enforce_min_pace;
@ -10423,7 +10424,9 @@ rack_get_sockopt(struct socket *so, struct sockopt *sopt,
break;
}
INP_WUNLOCK(inp);
error = sooptcopyout(sopt, &optval, sizeof optval);
if (error == 0) {
error = sooptcopyout(sopt, &optval, sizeof optval);
}
return (error);
}