From owner-svn-src-head@freebsd.org Fri Feb 1 03:09:13 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E6DB14C152A;
Fri, 1 Feb 2019 03:09:13 +0000 (UTC)
(envelope-from araujo@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id BD33E88E96;
Fri, 1 Feb 2019 03:09:12 +0000 (UTC)
(envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B33F718F72;
Fri, 1 Feb 2019 03:09:12 +0000 (UTC)
(envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1139Cxl025485;
Fri, 1 Feb 2019 03:09:12 GMT (envelope-from araujo@FreeBSD.org)
Received: (from araujo@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1139CUe025482;
Fri, 1 Feb 2019 03:09:12 GMT (envelope-from araujo@FreeBSD.org)
Message-Id: <201902010309.x1139CUe025482@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: araujo set sender to
araujo@FreeBSD.org using -f
From: Marcelo Araujo <araujo@FreeBSD.org>
Date: Fri, 1 Feb 2019 03:09:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r343642 - head/usr.sbin/bhyve
X-SVN-Group: head
X-SVN-Commit-Author: araujo
X-SVN-Commit-Paths: head/usr.sbin/bhyve
X-SVN-Commit-Revision: 343642
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: BD33E88E96
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.96 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.998,0];
NEURAL_HAM_SHORT(-0.97)[-0.965,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
NEURAL_HAM_LONG(-1.00)[-0.999,0]
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Feb 2019 03:09:13 -0000
Author: araujo
Date: Fri Feb 1 03:09:11 2019
New Revision: 343642
URL: https://svnweb.freebsd.org/changeset/base/343642
Log:
Revert r343634:
Mostly a cosmetic change to replace strlen with strnlen.
Requested by: kib and imp
Modified:
head/usr.sbin/bhyve/bhyverun.c
head/usr.sbin/bhyve/smbiostbl.c
head/usr.sbin/bhyve/usb_mouse.c
Modified: head/usr.sbin/bhyve/bhyverun.c
==============================================================================
--- head/usr.sbin/bhyve/bhyverun.c Fri Feb 1 03:02:52 2019 (r343641)
+++ head/usr.sbin/bhyve/bhyverun.c Fri Feb 1 03:09:11 2019 (r343642)
@@ -233,8 +233,8 @@ usage(int code)
" -W: force virtio to use single-vector MSI\n"
" -x: local apic is in x2APIC mode\n"
" -Y: disable MPtable generation\n",
- progname, (int)strnlen(progname, PATH_MAX), "", (int)strnlen(progname, PATH_MAX), "",
- (int)strnlen(progname, PATH_MAX), "");
+ progname, (int)strlen(progname), "", (int)strlen(progname), "",
+ (int)strlen(progname), "");
exit(code);
}
Modified: head/usr.sbin/bhyve/smbiostbl.c
==============================================================================
--- head/usr.sbin/bhyve/smbiostbl.c Fri Feb 1 03:02:52 2019 (r343641)
+++ head/usr.sbin/bhyve/smbiostbl.c Fri Feb 1 03:09:11 2019 (r343642)
@@ -558,7 +558,7 @@ smbios_generic_initializer(struct smbios_structure *te
int len;
string = template_strings[i];
- len = strnlen(string, SMBIOS_MAX_LENGTH) + 1;
+ len = strlen(string) + 1;
memcpy(curaddr, string, len);
curaddr += len;
}
@@ -611,7 +611,7 @@ smbios_type1_initializer(struct smbios_structure *temp
return (-1);
MD5Init(&mdctx);
- MD5Update(&mdctx, vmname, strnlen(vmname, PATH_MAX));
+ MD5Update(&mdctx, vmname, strlen(vmname));
MD5Update(&mdctx, hostname, sizeof(hostname));
MD5Final(digest, &mdctx);
Modified: head/usr.sbin/bhyve/usb_mouse.c
==============================================================================
--- head/usr.sbin/bhyve/usb_mouse.c Fri Feb 1 03:02:52 2019 (r343641)
+++ head/usr.sbin/bhyve/usb_mouse.c Fri Feb 1 03:09:11 2019 (r343642)
@@ -70,7 +70,6 @@ enum {
UMSTR_MAX
};
-#define UMOUSE_DESC_MAX_LEN 32
static const char *umouse_desc_strings[] = {
"\x04\x09",
"BHYVE",
@@ -442,7 +441,7 @@ umouse_request(void *scarg, struct usb_data_xfer *xfer
goto done;
}
- slen = 2 + strnlen(str, UMOUSE_DESC_MAX_LEN) * 2;
+ slen = 2 + strlen(str) * 2;
udata[0] = slen;
udata[1] = UDESC_STRING;