Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Mar 2015 18:22:21 +0000 (UTC)
From:      Ian Lepore <ian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r279934 - head/sys/dev/cxgbe
Message-ID:  <201503121822.t2CIML1c044098@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ian
Date: Thu Mar 12 18:22:20 2015
New Revision: 279934
URL: https://svnweb.freebsd.org/changeset/base/279934

Log:
  Nullterminate strings returned via sysctl.
  
  PR:		195668

Modified:
  head/sys/dev/cxgbe/t4_l2t.c
  head/sys/dev/cxgbe/t4_main.c

Modified: head/sys/dev/cxgbe/t4_l2t.c
==============================================================================
--- head/sys/dev/cxgbe/t4_l2t.c	Thu Mar 12 18:09:39 2015	(r279933)
+++ head/sys/dev/cxgbe/t4_l2t.c	Thu Mar 12 18:22:20 2015	(r279934)
@@ -321,6 +321,7 @@ skip:
 		mtx_unlock(&e->lock);
 	}
 
+	sbuf_putc(&sb, 0); /* nullterm */
 	rc = sbuf_finish(sb);
 	sbuf_delete(sb);
 

Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c	Thu Mar 12 18:09:39 2015	(r279933)
+++ head/sys/dev/cxgbe/t4_main.c	Thu Mar 12 18:22:20 2015	(r279934)
@@ -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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503121822.t2CIML1c044098>