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

Use sbuf_new_for_sysctl() instead of plain sbuf_new() to ensure sysctl

Browse Source 
string returned to userland is nulterminated.

PR:		195668
This commit is contained in:
Ian Lepore 2015-03-14 18:11:24 +00:00
parent 208264283d
commit 751ccc429d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=279997
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netinet/tcp_hostcache.c
View File

@ -596,7 +596,7 @@ tcp_hc_update(struct in_conninfo *inc, struct hc_metrics_lite *hcml)
static int
sysctl_tcp_hc_list(SYSCTL_HANDLER_ARGS)
{
int linesize = 128;
const int linesize = 128;
struct sbuf sb;
int i, error;
struct hc_metrics *hc_entry;
@ -604,8 +604,7 @@ sysctl_tcp_hc_list(SYSCTL_HANDLER_ARGS)
char ip6buf[INET6_ADDRSTRLEN];
#endif
sbuf_new(&sb, NULL, linesize * (V_tcp_hostcache.cache_count + 1),
SBUF_FIXEDLEN);
sbuf_new_for_sysctl(&sb, NULL, linesize, req);
sbuf_printf(&sb,
"\nIP address MTU SSTRESH RTT RTTVAR BANDWIDTH "
@ -642,8 +641,7 @@ sysctl_tcp_hc_list(SYSCTL_HANDLER_ARGS)
THC_UNLOCK(&V_tcp_hostcache.hashbase[i].hch_mtx);
}
#undef msec
sbuf_finish(&sb);
error = SYSCTL_OUT(req, sbuf_data(&sb), sbuf_len(&sb));
error = sbuf_finish(&sb);
sbuf_delete(&sb);
return(error);
}