svn commit: r361161 - stable/11/usr.sbin/bluetooth/hccontrol

[Hans Petter Selasky]

Author: hselasky
Date: Mon May 18 08:52:40 2020
New Revision: 361161
URL: https://svnweb.freebsd.org/changeset/base/361161

Log:
  MFC r360095:
  Fix cut and paste off-by-one error in hccontrol(8).
  Make sure strncpy() doesn't write beyond its given buffer.
  
  PR:		245739
  Sponsored by:	Mellanox Technologies

Modified:
  stable/11/usr.sbin/bluetooth/hccontrol/util.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/bluetooth/hccontrol/util.c
==============================================================================
--- stable/11/usr.sbin/bluetooth/hccontrol/util.c	Mon May 18 08:52:06 2020	(r361160)
+++ stable/11/usr.sbin/bluetooth/hccontrol/util.c	Mon May 18 08:52:40 2020	(r361161)
@@ -134,6 +134,7 @@ hci_hmode2str(int mode, char *buffer, int size)
 		int	n;
 
 		memset(buffer, 0, size);
+		size--;
 		for (n = 0; n < SIZE(t); n++) {
 			int	len = strlen(buffer);
 
@@ -347,6 +348,7 @@ hci_features2str(uint8_t *features, char *buffer, int 
 
 		memset(buffer, 0, size);
 		len1 = 0;
+		size--;
 
 		for (n = 0; n < SIZE(t); n++) {
 			for (i = 0; i < SIZE(t[n]); i++) {
@@ -460,6 +462,7 @@ hci_le_features2str(uint8_t *features, char *buffer, i
 
 		memset(buffer, 0, size);
 		len1 = 0;
+		size--;
 
 		for (n = 0; n < SIZE(t); n++) {
 			for (i = 0; i < SIZE(t[n]); i++) {