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

There was quite a bit of feedback on r336282 that has led to the

Browse Source 
submitter to want to revert it.
This commit is contained in:
Sean Bruno 2018-07-14 23:53:51 +00:00
parent 6e0bca03bd
commit c8b1bdc31c
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/netinet/ip_output.c
View File

@ -1256,18 +1256,12 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
switch (sopt->sopt_name) {
case IP_OPTIONS:
case IP_RETOPTS:
if (inp->inp_options) {
unsigned long len = ulmin(inp->inp_options->m_len, sopt->sopt_valsize);
struct mbuf *options = malloc(len, M_TEMP, M_WAITOK);
INP_RLOCK(inp);
bcopy(inp->inp_options, options, len);
INP_RUNLOCK(inp);
if (inp->inp_options)
error = sooptcopyout(sopt,
mtod(options,
mtod(inp->inp_options,
char *),
len);
free(options, M_TEMP);
} else
inp->inp_options->m_len);
else
sopt->sopt_valsize = 0;
break;