From nobody Tue Oct 17 13:58:07 2023 X-Original-To: dev-commits-src-all@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 4S8wYC37tNz4xXn6; Tue, 17 Oct 2023 13:58:07 +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 4S8wYC2cvCz3MbZ; Tue, 17 Oct 2023 13:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697551087; 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=HZsx3gRkpPe7jnoe5iYhHg1uOirV6ZrN1Jpx3TfGqkI=; b=L8l3Y+mNaorgIczpOoURBoLQB9BqR9HzDTKQyLQtfKtdd/UWkFuAhErLDv/CLPo+YHM02a BIxaNTAmac7RVM+O78WLw7aHPmGHZS3/6rXc1V1V1IOOBMW8T5JBZifbq9F0y1oMmlO+/y sWDNpXdTatNRc9WOPmV6q5FCM7qlJ5QTIV1S2s85yiRnk0S5E0xHCuUyKpK7BKKF9Dg8Im NW9EfwiImXmoIKOfPd1FfyBkUbQRH78g9RksBCzzQ1fkTz6z8WVmmOr+ru9njdfvGfOnr9 8y1PS24C/QIBy7epDRHt6so/NgKVFBlwFuvkRD5/OtLbrOiwBavDaVOvk2cgBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697551087; a=rsa-sha256; cv=none; b=xFr01KkaoQudD/Je0fCf/fFE54o3gx4UKLz3KfrSkWXMBftr9J0rt8V+x4HcnSee1wr0JC ptkEe6Ju65Ws/rWr8BiBldN/raUlv9SR/+DA5Sf9L0g21Egsv3OftgRdhjqz2/WRpNI2M+ wpEdKqZw4LBWgxdxyepxj3BIm3fv1DLRsYV2xOYWs+60j5N3cJfhJBE1zugWTDv91gpjC3 Km8BD2I9DFt8tN4Nti5Wzh63h5nMk1dNTSP+81EAOCpbDUgFLud1P4JTDWAvm/Yk4vQ66P w7e6UZCZh+OYX76cTpC8ESRJiIHTgG59cARlwhHAG28NmbyiAsapjONX8U0oEg== 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=1697551087; 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=HZsx3gRkpPe7jnoe5iYhHg1uOirV6ZrN1Jpx3TfGqkI=; b=kxgJxeT1RWNK59LRb3tkMJuMLHQ/HIw4U6tWT0GzEuhLOkNILTGbJQtUB0SdlhOH5n51ik XW8spIEMlwy0iqMY7qq5rilKj5xG2FweZrFhMs7F1JMhxKgIkEG5W5tB+pBYqKccWaYHk5 33U32hc5GCCKslHKHOMGM2q5outHHLxuqz11lzhjPv9UWdD9j2WD/yJ8axzg82in4EFl1c QVv48V9IhCUPVIxizQ2kMY/OEM44sbKCz4MPciYATYSJ5TdqahsBp7i1U+d+/x19PWXGek M6/C84wmu9w9B6vQMPTHYOLuEXLbmvQjHiD8dPujIxMoAZBWmf29mBQS+l91Vw== 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 4S8wYC1RRvzBJs; Tue, 17 Oct 2023 13:58:07 +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 39HDw7dR029963; Tue, 17 Oct 2023 13:58:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDw7kp029960; Tue, 17 Oct 2023 13:58:07 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:58:07 GMT Message-Id: <202310171358.39HDw7kp029960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 4a3810075fd3 - main - bhyve: fix buffer overflow in QemuFwCfg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a3810075fd307301d8b3f087efe7a61bc37199b Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=4a3810075fd307301d8b3f087efe7a61bc37199b commit 4a3810075fd307301d8b3f087efe7a61bc37199b Author: Corvin Köhne AuthorDate: 2023-10-16 08:52:21 +0000 Commit: Corvin Köhne CommitDate: 2023-10-17 13:57:28 +0000 bhyve: fix buffer overflow in QemuFwCfg We're accessing one element of the newly allocated and the old directory too much. Reported by: andy@omniosce.org Reviewed by: markj Fixes: 6f9ebb3d0fed2b0ae604dd6daf17f1fe1d8df216 ("bhyve: add helper for adding fwcfg files") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42220 --- usr.sbin/bhyve/qemu_fwcfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index 830cee730dbd..5b33dfab037d 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -365,7 +365,7 @@ qemu_fwcfg_add_file(const char *name, const uint32_t size, void *const data) /* copy files above file_index to directory */ memcpy(&new_directory->files[file_index + 1], &fwcfg_sc.directory->files[file_index], - (count - file_index) * sizeof(struct qemu_fwcfg_file)); + (count - file_index - 1) * sizeof(struct qemu_fwcfg_file)); /* free old directory */ free(fwcfg_sc.directory);