From nobody Thu Nov 03 12:53:27 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N33bC6KV3z4gwxy; Thu, 3 Nov 2022 12:53:27 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N33bC5r7Bz3W7H; Thu, 3 Nov 2022 12:53:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667480007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l3XWLBWn7xJsnw9EDTyYVCk+E1T6ix3F2c9M1RJ4CiE=; b=RxElyTcRP6H32LXKkGYF7YOm7cnSNldRpWEpIU6EuRbiZCCudAeTdgOvAMyj6CpVf2p818 TT8Gu3JZI+F9RzvcKzqBtuRDAo8Ka5+9WQngCSeW0myXkCxLqtvln4yKhsAoEczmdn9EIO jESkA3qM2KWQfU/DI7kctvZb+wyXRBJnP4BpKCmIhbQJJX1Zd46EbFQw91tW6nlnCA/UnC 8ooChhPeoQhGcHjx6GmFi+f1zMddMKBjJVl4UdrIG4+5kKenQs3NDET6Ny6bYsus386suk cqCcei1g9WGzNQF3/rLF9igZq4rzNXrYutNpk/3U7SzDykKATjjCCEfxnrG3Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N33bC4x9Jzcp3; Thu, 3 Nov 2022 12:53:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A3CrRWJ047020; Thu, 3 Nov 2022 12:53:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A3CrRli047019; Thu, 3 Nov 2022 12:53:27 GMT (envelope-from git) Date: Thu, 3 Nov 2022 12:53:27 GMT Message-Id: <202211031253.2A3CrRli047019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: faa530a15f73 - stable/13 - bhyve: Make sure that the VNC version is initialized List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: faa530a15f73cfc1c7ca9f977b3fdfc06ebee7f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667480007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l3XWLBWn7xJsnw9EDTyYVCk+E1T6ix3F2c9M1RJ4CiE=; b=oVa7dvxZKunEi99a0ZnVMkXlVwUUnwaomXVEqskQIOek03H4N4Rk+/wZ4NJwHog0RSGKkj V0p2RGUmJvvA/2sTcDVcKK1RuquEnKuQhB5HmTNQnm+sec+PZxIirrF+jDUKnl7LBwzmuZ AznxIBVmIUMI+fW7l9++gwL93tTZzHR4H6/XQvQu8TtO9XwsZlsj8al0JSCeES5rrwMNz7 Par90R8gZOaip9ojTDHXOTBaSxiYWCc3GUv/ppLzFarCa7hOJndsd/JA7MeHnKWSAFcB6T zlT7urzCm6j2KjHLtdEXH2jTNk0UoXUj8cJPDbzcFfRJ0sxGo+hR4jdcdpU9PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667480007; a=rsa-sha256; cv=none; b=tLPqg6zIN2KE54YRJFmvVchKUfj0+t85Fc4bwxf27Vky9F74vsL+Cz980a/LR+YdVoOCXj t1120cYKVOC1vhdrKrGcVrrZgRnoVa6yzEIC1MSEwpU95ANRSjkNB8iVUYwXcnSGJ2LVh9 hrAehKK0Zu0cWw5k5nL7KAK5GIhApCU7fwqoFCVk7/pVXaZ/qZ1vGw3SE8YKxhk7fPRt6Q IZVE9qlcHx2yNu26kd16o0C/RAIfHoCnEYRcuArihhodk5uap5P9SkMuWMnpUoQP/RHVDo b+kYzqQmb+R+Rli/nZuxqzbCbvfEMGDy0yU/YBADOw0BE7MWW8ufowRpBBnOzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=faa530a15f73cfc1c7ca9f977b3fdfc06ebee7f5 commit faa530a15f73cfc1c7ca9f977b3fdfc06ebee7f5 Author: Mark Johnston AuthorDate: 2022-10-27 14:46:36 +0000 Commit: Mark Johnston CommitDate: 2022-11-03 12:51:20 +0000 bhyve: Make sure that the VNC version is initialized clang warned that "client_ver" can be left uninitialized. This change causes the new connection to be dropped if a version string is not presented. Reviewed by: jhb (cherry picked from commit 04336c0562488080300e68157ada5bc8eae71e54) --- usr.sbin/bhyve/rfb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/rfb.c b/usr.sbin/bhyve/rfb.c index 4a550bca975b..2a7493f8fd6a 100644 --- a/usr.sbin/bhyve/rfb.c +++ b/usr.sbin/bhyve/rfb.c @@ -819,9 +819,12 @@ rfb_handle(struct rfb_softc *rc, int cfd) /* 1b. Read client version */ len = stream_read(cfd, buf, VERSION_LENGTH); - if (len == VERSION_LENGTH && !strncmp(vbuf, buf, VERSION_LENGTH - 2)) { - client_ver = buf[VERSION_LENGTH - 2]; + if (len != VERSION_LENGTH || + strncmp(vbuf, buf, VERSION_LENGTH - 2) != 0) { + goto done; } + + client_ver = buf[VERSION_LENGTH - 2]; if (client_ver != CVERS_3_8 && client_ver != CVERS_3_7) { /* only recognize 3.3, 3.7 & 3.8. Others dflt to 3.3 */ client_ver = CVERS_3_3;