From nobody Tue Jan 30 14:19:19 2024 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 4TPS3C3ZJ5z58w4C; Tue, 30 Jan 2024 14:19:19 +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 4TPS3C33knz4jkw; Tue, 30 Jan 2024 14:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706624359; 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=s8xrfpvTqJW8BmXLjk+tzt3IhcpnWGV+SiKhxQ+DIYA=; b=OYgaU3rivl9SgMH6fKNJRokn91lbQMTfaSBiB/kwkbggRvVCxF0Hr2m0rZkXH9eNQsA15c yYkXDWrGxt2cu8kPSl0CsrjvKdU2IcLI5+5zalV/eWOfjsUka0086ZbgtEtt5CYYezQxJ6 SfDCBTe/vj9xshr5lU4yKDofxrm17QEmwQj9iJgUJOus3PPczDECwA8qI7/GIMPKMN6alS 1vY3iP3h7xRV7c3I9sG4YH30YEcu3lO04CM+Q/cWFz7JhD4u4vtcrIWEq3o9Ucpqcrs0gj wZ349NR7EkSvN+UXIRDYEsMvJ1SK1/IN0YeL29GhnYuS9T0M19d0xlJhBAYfpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706624359; 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=s8xrfpvTqJW8BmXLjk+tzt3IhcpnWGV+SiKhxQ+DIYA=; b=Uq8TFTA4leQ2L2CCCpXEi+kGn8P0FORKbViPztwcFsb5uaMfwrdU4NvS5dw6Rsowo8ohHu O/opxx3bjPlO47i3z0v2Cda2FXvUk+U5FT8t0ybEvuATjZbkvaam7nb3lfEVZV+mUH0gwA dzUsnspJ41113ipbUWN5TXUA5/NmGANUJbsnoqAUPtFnPIRfR3repEvtwjGPAO421lbOBt JKNLynyTrkQIRzxhdFFKJYDCz1EOoLWITP1MiFvCbatqYZt+jK4xryLC80BiOXOAITJ91K wHornhcKav0ODuW/GsP8XLp0LmxXU5Q9kfSIiJBRnDlwd8N8v5EbEQC5cXJFrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706624359; a=rsa-sha256; cv=none; b=F79Dzv1hIfUljQgWLyrJ8fEboFrEFIyZoXgobz6luwEunM/bhz93Og4Yi2LVPnQJFPFjWk dYGTK91DlBVoZJ3Q4mgUxQpbAQFhTLp0zcSdcCKQrWVOsYoVEkt9wi4D9xMgQmFL4GxBrd QCNKmESPBch6hzSMSyiovhwHJvNLIm/xx0UnCp1qbl0y7f3Q7aWCaIxvhdBtBo1xMXHnER BULulK+Z8V0QJKQAIqPgExMdeA2cRk9USjCelWR5iZ4GR1+y56VJ1L3UDhpjHoxTVpliTy 4nEdPkYnPd3pfdZAvpC90ZCKIRuviGwINN0KUkI491scqq+7T2Dy8MXkPsGAsQ== 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 4TPS3C26pkzfTn; Tue, 30 Jan 2024 14:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40UEJJlk096474; Tue, 30 Jan 2024 14:19:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UEJJN4096471; Tue, 30 Jan 2024 14:19:19 GMT (envelope-from git) Date: Tue, 30 Jan 2024 14:19:19 GMT Message-Id: <202401301419.40UEJJN4096471@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: 91ebe67e90d5 - stable/14 - bhyve: Avoid underflows when handling remote commands 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/14 X-Git-Reftype: branch X-Git-Commit: 91ebe67e90d5859df282aac9c978e54789217b12 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=91ebe67e90d5859df282aac9c978e54789217b12 commit 91ebe67e90d5859df282aac9c978e54789217b12 Author: Mark Johnston AuthorDate: 2024-01-23 16:40:40 +0000 Commit: Mark Johnston CommitDate: 2024-01-30 14:18:53 +0000 bhyve: Avoid underflows when handling remote commands Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D43480 (cherry picked from commit cfa2c78aee859bfc6549951bb6a36085fdd374e8) --- usr.sbin/bhyve/gdb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index 9748f7d82b44..cc05a32a5c56 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -1053,6 +1053,8 @@ gdb_read_mem(const uint8_t *data, size_t len) bool started; int error; + assert(len >= 1); + /* Skip 'm' */ data += 1; len -= 1; @@ -1164,6 +1166,8 @@ gdb_write_mem(const uint8_t *data, size_t len) size_t resid, todo, bytes; int error; + assert(len >= 1); + /* Skip 'M' */ data += 1; len -= 1; @@ -1558,7 +1562,7 @@ gdb_query(const uint8_t *data, size_t len) data += strlen("qThreadExtraInfo"); len -= strlen("qThreadExtraInfo"); - if (*data != ',') { + if (len == 0 || *data != ',') { send_error(EINVAL); return; } @@ -1609,7 +1613,7 @@ handle_command(const uint8_t *data, size_t len) case 'H': { int tid; - if (data[1] != 'g' && data[1] != 'c') { + if (len < 2 || (data[1] != 'g' && data[1] != 'c')) { send_error(EINVAL); break; }