From owner-svn-src-all@freebsd.org Fri Feb 1 00:36:25 2019 Return-Path: Delivered-To: svn-src-all@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 6003A14BDBE7 for ; Fri, 1 Feb 2019 00:36:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D80C883C12 for ; Fri, 1 Feb 2019 00:36:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x729.google.com with SMTP id g125so3077115qke.4 for ; Thu, 31 Jan 2019 16:36:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=uAdbXTvvoWr+JJKVQUM7EI3Jr9E2QMY7EiAhfHGrV5s=; b=k2Uh/cXAruGINC3BB+WYLtLaHxdJl6GoDRcrxE6f2X587x8jjg/s1mSwgJZUM9WJdY jdTY1U+iVn+MYQ4LTDU0BbOyPx3Xe7QbVE1RHOgxxNWK2L67+Li+qafnnm4GsGi7Dzbm 1w2PZ0HhYagmhMosLD89UuZzoH0vQd0WumGViAnVar4ckiMCzGBS7ueT6udKOSVXS1+1 0F6PBjqqsTB9LFricXQTNqOc2HzwcrfoFGsAi3NkAQOSSln54eYSF2nemLhBYM1hnUxM dakoDfjkJzgk3iWhO8/1c6jgaJAKBJrd9qorZg1Raezj2S4CHFH8ajYQQ+9/pVhx6Ex6 QKSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=uAdbXTvvoWr+JJKVQUM7EI3Jr9E2QMY7EiAhfHGrV5s=; b=dwcBXuB/pw5GP+tCYlmWNp6OD6adpVLtzLX54I2xMs0COXT0X7r990/F5WsV9zPEpe e54Am4Dk+iUcR+gHpnmL2I2isRe21M9rHBZOK3NizHqs7MuyX0KA1Qp0qpXnlMXIWhry yZAf8BV/LWKU2uNhklZlSO80MrGv3rsn5Am0ZFKuJ9hw2R+09MhbBXXcAzTeQTcSvnM0 1XS0pwgO1tERF4SK0LcS/n77WEQOEY0xy6daEMYtdHV2VulV0WySOxOC+QpH/LQRDuEk FkBRt10I+NoubT3iA/h8HyQoMpf2N+ajMm/xUQpokBsptwcSVuxgtArPeTAiMKQyMBVv qxHA== X-Gm-Message-State: AJcUukfjDj4NKPDgZvjXIvI49MQXwY1txBv5drUss2R/Px3jzL+m8L9q dXnji3mkGTSmcu8fdbgnLuaf6NHS6rr6wvkAnR54vw== X-Google-Smtp-Source: ALg8bN4LJgrR2HLBuVdsSrXQvfX+LBBbrBN1P39sFvvKy14+jeVRRgbZ2PZ7bVn0M0o6Sr1hB/OBZ1O6N7BMKzSmh+k= X-Received: by 2002:a37:6c05:: with SMTP id h5mr33970519qkc.175.1548981383584; Thu, 31 Jan 2019 16:36:23 -0800 (PST) MIME-Version: 1.0 References: <201901312332.x0VNWJ6o016057@repo.freebsd.org> <20190131234609.GZ24863@kib.kiev.ua> In-Reply-To: <20190131234609.GZ24863@kib.kiev.ua> From: Warner Losh Date: Thu, 31 Jan 2019 17:36:04 -0700 Message-ID: Subject: Re: svn commit: r343634 - head/usr.sbin/bhyve To: Konstantin Belousov Cc: Marcelo Araujo , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: D80C883C12 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2019 00:36:25 -0000 On Thu, Jan 31, 2019, 4:46 PM Konstantin Belousov On Thu, Jan 31, 2019 at 11:32:19PM +0000, Marcelo Araujo wrote: > > Author: araujo > > Date: Thu Jan 31 23:32:19 2019 > > New Revision: 343634 > > URL: https://svnweb.freebsd.org/changeset/base/343634 > > > > Log: > > Mostly a cosmetic change to replace strlen with strnlen. > This is not cosmetic, and more, for instance the usage() part of the change > does not make any sense to me. > I specifically objected as well and was blown off. What gives? Warner > > > Obtained from: Project ACRN > > MFC after: 2 weeks > > > > 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 Thu Jan 31 23:21:18 2019 > (r343633) > > +++ head/usr.sbin/bhyve/bhyverun.c Thu Jan 31 23:32:19 2019 > (r343634) > > @@ -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)strlen(progname), "", > (int)strlen(progname), "", > > - (int)strlen(progname), ""); > > + progname, (int)strnlen(progname, PATH_MAX), "", > (int)strnlen(progname, PATH_MAX), "", > > + (int)strnlen(progname, PATH_MAX), ""); > > > > exit(code); > > } > > > > Modified: head/usr.sbin/bhyve/smbiostbl.c > > > ============================================================================== > > --- head/usr.sbin/bhyve/smbiostbl.c Thu Jan 31 23:21:18 2019 > (r343633) > > +++ head/usr.sbin/bhyve/smbiostbl.c Thu Jan 31 23:32:19 2019 > (r343634) > > @@ -558,7 +558,7 @@ smbios_generic_initializer(struct smbios_structure > *te > > int len; > > > > string = template_strings[i]; > > - len = strlen(string) + 1; > > + len = strnlen(string, SMBIOS_MAX_LENGTH) + 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, strlen(vmname)); > > + MD5Update(&mdctx, vmname, strnlen(vmname, PATH_MAX)); > > MD5Update(&mdctx, hostname, sizeof(hostname)); > > MD5Final(digest, &mdctx); > > > > > > Modified: head/usr.sbin/bhyve/usb_mouse.c > > > ============================================================================== > > --- head/usr.sbin/bhyve/usb_mouse.c Thu Jan 31 23:21:18 2019 > (r343633) > > +++ head/usr.sbin/bhyve/usb_mouse.c Thu Jan 31 23:32:19 2019 > (r343634) > > @@ -70,6 +70,7 @@ enum { > > UMSTR_MAX > > }; > > > > +#define UMOUSE_DESC_MAX_LEN 32 > > static const char *umouse_desc_strings[] = { > > "\x04\x09", > > "BHYVE", > > @@ -441,7 +442,7 @@ umouse_request(void *scarg, struct usb_data_xfer > *xfer > > goto done; > > } > > > > - slen = 2 + strlen(str) * 2; > > + slen = 2 + strnlen(str, UMOUSE_DESC_MAX_LEN) * 2; > > udata[0] = slen; > > udata[1] = UDESC_STRING; > > > >