From nobody Tue Mar 31 15:59:01 2026 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 4flXqC4dzWz6WFCP for ; Tue, 31 Mar 2026 15:59:03 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4flXqB6ybSz3gwX for ; Tue, 31 Mar 2026 15:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774972743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=na06nIFGXmCDUXhORjiXD4cjt4LC4XZp/tcmcRWf7LY=; b=LzFIrgKTZe8WESyjJPF5Qttv6PqohGmXxYTfmLOED3aXJ1+pWnOt/FMTvkiYfE3XdHSb1H XcF9cNghyKKR4t+TQZ+nhTE6lJb0qh5wvyKid55upJIxVsVnoxpwOY5eb1QpbZC/CcdISa kB6Pt0WwT7hFdqLwrvPvUuccArFIPN73bvp4TMSYVGLOsvDBeBGfglh78HpXZDkyC1kH2I lAkQhinteaOafNt0TRNHPf26oOFBNMKGfcf4GGiUPo36i+G3AlCVqxJXzeGLGfNXUInxOS hKuiFzPeq/P9UuapByzkqcMV3hxIYev6LWgX7hFDJFBXd0AW0765OrygqAmoMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774972743; a=rsa-sha256; cv=none; b=pYmvSCAJ1e5VC9+Hw7KFYHvPVa+lvs+VgcjK69mGse15UCxNWl9IRihD33/TW25RDuwB0Z WbDRgZK1R1lam5mWweC5vhU2l5BWYt5VYeKQ8D4H6Zz2ZLy8Cyd0Csx2SpDIRuywNun8Wr w33yeqN5WQCRDLwOswWosMVTnoYbaXZOWeL6XHguWoD3rzMlXiB7+Z3G4VB/hSK2l9MYiS PvNKYFvBE8OqkmmlhFlA54sYVR/9ljPRZB42Q1zCK1JTe2u3H47MWBJaph+8FLj1jtgqKM 8FrdOn+bBfvqloftTYbSwg5zXqpuZllymLzNDSFTLpbnC1J5Y4tvhcSm6t10aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774972743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=na06nIFGXmCDUXhORjiXD4cjt4LC4XZp/tcmcRWf7LY=; b=S28J2eh3maeizRT316roNf3pHEuWKpeQs0y/ZRLpbDyHeOSGr5wPdeLMqVtTwIm9fPPZoN iewF/pb28qjubYj8Mf7ifC7g06uYNhKaYO2xJKhGupkNFmJ1rHZ3mDsiFgX7csdc4pFUzr j0MgiJ5dNv/eRNKrfKVtKrPbCM+yNbly6GYFelObPHIAuuKLNrdEKja7amSI4xZq2VwIBX GygHzu7Z5DjZc/j+/CMWaYXe+/ozLJahQOYHA/9qSIWqOYrWpbUZxTu/Wo6avyCx9WVbC+ 2AbZ/7expk1FOk92f013dtf1zaEoKxfzvQ9LIAkZs2IBohlNcl5cUS39qpPcNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flXq91SF7zcc5 for ; Tue, 31 Mar 2026 15:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aa71 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 15:59:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Hayzam Sherif From: Mark Johnston Subject: git: 61a6418ad703 - stable/15 - bhyve: Propagate errors from rfb_recv_* functions 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 61a6418ad703ebe5945d56911572b67e61743b01 Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 15:59:01 +0000 Message-Id: <69cbef45.3aa71.2b1c08e9@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=61a6418ad703ebe5945d56911572b67e61743b01 commit 61a6418ad703ebe5945d56911572b67e61743b01 Author: Hayzam Sherif AuthorDate: 2026-02-16 17:46:35 +0000 Commit: Mark Johnston CommitDate: 2026-03-31 15:57:29 +0000 bhyve: Propagate errors from rfb_recv_* functions Update rfb_recv_* functions to return -1 on failure and 0 on success. Update rfb_handle to check these return values and drop the connection if an error occurs. Signed-off-by: Hayzam Sherif Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation (cherry picked from commit 757b0bf5cf46230bcbeeb298f734b9bb7cde1817) --- usr.sbin/bhyve/rfb.c | 101 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 76 insertions(+), 25 deletions(-) diff --git a/usr.sbin/bhyve/rfb.c b/usr.sbin/bhyve/rfb.c index 716e191e2fc0..6e03d2860b7d 100644 --- a/usr.sbin/bhyve/rfb.c +++ b/usr.sbin/bhyve/rfb.c @@ -334,16 +334,19 @@ rfb_send_extended_keyevent_update_msg(struct rfb_softc *rc, int cfd) stream_write(cfd, &srect_hdr, sizeof(struct rfb_srvr_rect_hdr)); } -static void +static int rfb_recv_set_pixfmt_msg(struct rfb_softc *rc __unused, int cfd) { struct rfb_pixfmt_msg pixfmt_msg; uint8_t red_shift, green_shift, blue_shift; uint16_t red_max, green_max, blue_max; bool adjust_pixels = true; + int len; - (void)stream_read(cfd, (uint8_t *)&pixfmt_msg + 1, + len = stream_read(cfd, (uint8_t *)&pixfmt_msg + 1, sizeof(pixfmt_msg) - 1); + if (len <= 0) + return (-1); /* * The framebuffer is fixed at 32 bit and orders the colors @@ -355,7 +358,7 @@ rfb_recv_set_pixfmt_msg(struct rfb_softc *rc __unused, int cfd) WPRINTF(("rfb: pixfmt unsupported bitdepth bpp: %d " "truecolor: %d", pixfmt_msg.pixfmt.bpp, pixfmt_msg.pixfmt.truecolor)); - return; + return (0); } red_max = ntohs(pixfmt_msg.pixfmt.red_max); @@ -367,7 +370,7 @@ rfb_recv_set_pixfmt_msg(struct rfb_softc *rc __unused, int cfd) WPRINTF(("rfb: pixfmt unsupported max values " "r: %d g: %d b: %d", red_max, green_max, blue_max)); - return; + return (0); } red_shift = pixfmt_msg.pixfmt.red_shift; @@ -381,7 +384,7 @@ rfb_recv_set_pixfmt_msg(struct rfb_softc *rc __unused, int cfd) WPRINTF(("rfb: pixfmt unsupported shift values " "r: %d g: %d b: %d", red_shift, green_shift, blue_shift)); - return; + return (0); } if (red_shift == PIXEL_RED_SHIFT && @@ -399,19 +402,27 @@ rfb_recv_set_pixfmt_msg(struct rfb_softc *rc __unused, int cfd) /* Notify the write thread to update */ rc->update_pixfmt = true; + + return (0); } -static void +static int rfb_recv_set_encodings_msg(struct rfb_softc *rc, int cfd) { struct rfb_enc_msg enc_msg; int i; uint32_t encoding; + int len; - (void)stream_read(cfd, (uint8_t *)&enc_msg + 1, sizeof(enc_msg) - 1); + len = stream_read(cfd, (uint8_t *)&enc_msg + 1, sizeof(enc_msg) - 1); + if (len <= 0) + return (-1); for (i = 0; i < htons(enc_msg.numencs); i++) { - (void)stream_read(cfd, &encoding, sizeof(encoding)); + len = stream_read(cfd, &encoding, sizeof(encoding)); + if (len <= 0) + return (-1); + switch (htonl(encoding)) { case RFB_ENCODING_RAW: rc->enc_raw_ok = true; @@ -430,6 +441,8 @@ rfb_recv_set_encodings_msg(struct rfb_softc *rc, int cfd) break; } } + + return (0); } /* @@ -842,12 +855,16 @@ done: } -static void +static int rfb_recv_update_msg(struct rfb_softc *rc, int cfd) { struct rfb_updt_msg updt_msg; + int len; - (void)stream_read(cfd, (uint8_t *)&updt_msg + 1 , sizeof(updt_msg) - 1); + len = stream_read(cfd, (uint8_t *)&updt_msg + 1, + sizeof(updt_msg) - 1); + if (len <= 0) + return (-1); if (rc->enc_extkeyevent_ok && (!rc->enc_extkeyevent_send)) { rfb_send_extended_keyevent_update_msg(rc, cfd); @@ -857,48 +874,68 @@ rfb_recv_update_msg(struct rfb_softc *rc, int cfd) rc->pending = true; if (!updt_msg.incremental) rc->update_all = true; + + return (0); } -static void +static int rfb_recv_key_msg(struct rfb_softc *rc, int cfd) { struct rfb_key_msg key_msg; + int len; - (void)stream_read(cfd, (uint8_t *)&key_msg + 1, sizeof(key_msg) - 1); + len = stream_read(cfd, (uint8_t *)&key_msg + 1, + sizeof(key_msg) - 1); + if (len <= 0) + return (-1); console_key_event(key_msg.down, htonl(key_msg.sym), htonl(0)); rc->input_detected = true; + + return (0); } -static void +static int rfb_recv_client_msg(struct rfb_softc *rc, int cfd) { struct rfb_client_msg client_msg; struct rfb_extended_key_msg extkey_msg; + int len; - (void)stream_read(cfd, (uint8_t *)&client_msg + 1, + len = stream_read(cfd, (uint8_t *)&client_msg + 1, sizeof(client_msg) - 1); + if (len <= 0) + return (-1); if (client_msg.subtype == RFB_CLIENTMSG_EXT_KEYEVENT) { - (void)stream_read(cfd, (uint8_t *)&extkey_msg + 2, + len = stream_read(cfd, (uint8_t *)&extkey_msg + 2, sizeof(extkey_msg) - 2); + if (len <= 0) + return (-1); console_key_event((int)extkey_msg.down, htonl(extkey_msg.sym), htonl(extkey_msg.code)); rc->input_detected = true; } + + return (0); } -static void +static int rfb_recv_ptr_msg(struct rfb_softc *rc, int cfd) { struct rfb_ptr_msg ptr_msg; + int len; - (void)stream_read(cfd, (uint8_t *)&ptr_msg + 1, sizeof(ptr_msg) - 1); + len = stream_read(cfd, (uint8_t *)&ptr_msg + 1, sizeof(ptr_msg) - 1); + if (len <= 0) + return (-1); console_ptr_event(ptr_msg.button, htons(ptr_msg.x), htons(ptr_msg.y)); rc->input_detected = true; + + return (0); } -static void +static int rfb_recv_cuttext_msg(struct rfb_softc *rc __unused, int cfd) { struct rfb_cuttext_msg ct_msg; @@ -906,12 +943,19 @@ rfb_recv_cuttext_msg(struct rfb_softc *rc __unused, int cfd) int len; len = stream_read(cfd, (uint8_t *)&ct_msg + 1, sizeof(ct_msg) - 1); + if (len <= 0) + return (-1); + ct_msg.length = htonl(ct_msg.length); while (ct_msg.length > 0) { len = stream_read(cfd, buf, ct_msg.length > sizeof(buf) ? sizeof(buf) : ct_msg.length); + if (len <= 0) + return (-1); ct_msg.length -= len; } + + return (0); } static int64_t @@ -1168,25 +1212,32 @@ report_and_done: switch (buf[0]) { case CS_SET_PIXEL_FORMAT: - rfb_recv_set_pixfmt_msg(rc, cfd); + if (rfb_recv_set_pixfmt_msg(rc, cfd) < 0) + goto done; break; case CS_SET_ENCODINGS: - rfb_recv_set_encodings_msg(rc, cfd); + if (rfb_recv_set_encodings_msg(rc, cfd) < 0) + goto done; break; case CS_UPDATE_MSG: - rfb_recv_update_msg(rc, cfd); + if (rfb_recv_update_msg(rc, cfd) < 0) + goto done; break; case CS_KEY_EVENT: - rfb_recv_key_msg(rc, cfd); + if (rfb_recv_key_msg(rc, cfd) < 0) + goto done; break; case CS_POINTER_EVENT: - rfb_recv_ptr_msg(rc, cfd); + if (rfb_recv_ptr_msg(rc, cfd) < 0) + goto done; break; case CS_CUT_TEXT: - rfb_recv_cuttext_msg(rc, cfd); + if (rfb_recv_cuttext_msg(rc, cfd) < 0) + goto done; break; case CS_MSG_CLIENT_QEMU: - rfb_recv_client_msg(rc, cfd); + if (rfb_recv_client_msg(rc, cfd) < 0) + goto done; break; default: WPRINTF(("rfb unknown cli-code %d!", buf[0] & 0xff));