summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2015-03-12 18:22:20 +0000
committerian <ian@FreeBSD.org>2015-03-12 18:22:20 +0000
commitd59418210a85cf22791d61966f2c49e737621535 (patch)
tree9ad9dfa400f65166b64149dea194665973143ceb
parent823ca56fd7539d98b687cf16dfe8e8476a4e3f79 (diff)
downloadFreeBSD-src-d59418210a85cf22791d61966f2c49e737621535.zip
FreeBSD-src-d59418210a85cf22791d61966f2c49e737621535.tar.gz
Nullterminate strings returned via sysctl.
PR: 195668
-rw-r--r--sys/dev/cxgbe/t4_l2t.c1
-rw-r--r--sys/dev/cxgbe/t4_main.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/cxgbe/t4_l2t.c b/sys/dev/cxgbe/t4_l2t.c
index cca1bf3..cb4a281 100644
--- a/sys/dev/cxgbe/t4_l2t.c
+++ b/sys/dev/cxgbe/t4_l2t.c
@@ -321,6 +321,7 @@ skip:
mtx_unlock(&e->lock);
}
+ sbuf_putc(&sb, 0); /* nullterm */
rc = sbuf_finish(sb);
sbuf_delete(sb);
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 94e7ed1..627caa6 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -5090,6 +5090,7 @@ sysctl_int_array(SYSCTL_HANDLER_ARGS)
for (i = arg1; arg2; arg2 -= sizeof(int), i++)
sbuf_printf(&sb, "%d ", *i);
sbuf_trim(&sb);
+ sbuf_putc(&sb, 0); /* nullterm */
sbuf_finish(&sb);
rc = sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req);
sbuf_delete(&sb);
OpenPOWER on IntegriCloud