From nobody Fri Dec 9 18:31:38 2022 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 4NTKNp4cjmz4jx8c; Fri, 9 Dec 2022 18:31:38 +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 4NTKNp3zBCz3LKx; Fri, 9 Dec 2022 18:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670610698; 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=gs3bxeY0rIti2LlyAOBKmYON6GTLQyonq/nzr7mzHZI=; b=lcS9vA/WdTopiNHx4UnVbA+2vt62ePegLgIPWTxUyrfelL4CVepZq61IWKef3M/0Qmg9lL SMlGFnCE2ims/mbKKbpJMmvly/aCM7ELLdT9yo34Fcq0C4QhCJdQ5+U5o4uNB+Ua9QXV9u SMlYYeJ9wq24MYHyEDDH5GzA5kEoCOpknxXtgiRBsMa7B0dVytjxBZIJyiMTnMVc6ukviu zIV3P+aUUZDnQntVeZVXXU5XSA/uZid/WYmeZNNDLblQzMW8CBuMj0mKcQxQTKPzq88d2L xHgKP8FVI6OFlRCyRsywJsLSBo6YPZ34kVBDuYw1jWHriIVkvvy41ZE+Cgvz8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670610698; 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=gs3bxeY0rIti2LlyAOBKmYON6GTLQyonq/nzr7mzHZI=; b=p4pFNj5YmDRtVMkRYqdtYtjrbm+Zo2czBG+nnsmd/P0Ihtr/o7qSCOr+L+CGetKMPURD1Y rb8NzatT2LacWOzTjFlwaZSdAcmeo4tGhJLNiWAUILFkVQH35xz+yTu3FK15wIB6C4nhx1 emDPwuVrT+mvo7iYkzKst/uheF1D8jx3Lz80CXYlWJcVVXyBlSTwCmjYI166coQDXYI8GE zwCy+W8Dcyfnw4qcqEbvRLINPTlQK6wGzR0HTppgthm5tzr9Cct2KUFWjODv6x8/IMiSRv NRIeaaRuJ6JelW83jfMEGtEKlz2gTw0J9l8WLCtCDibRV7oUbzz2PywDi7WuJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670610698; a=rsa-sha256; cv=none; b=dG/hXJYpfFcIAGUUiS5eJ/PrcPccIugofmPirtiuebbO9rpXS6nePhBKnXMJzVnsPjx62n uG2qc4wTSyFiztDOSuFA+mIccdfvOHpC2N7maHeQwzYiDdVcuha4AUwhuwk5/Rfi+sZWoH cIlOFndAUg6+Py6v7GWbBBNJq3tlO6NVYQyawQqY0GPrOpTFCjF/3eqfxi6BBykR5z3Om3 WT55byR8lc3gGharY+i5uIjx8TgdKUzkNiYutKDXhpWc6kA/pHdEszZrVk8NoRbxav7B+o 3MisCx09yiDmzwRZ5mkYPzqGTxOU8i7q1fXzjM/4jQxIpK/8oNXrTr09lt1dag== 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 4NTKNp33Qvzlmk; Fri, 9 Dec 2022 18:31:38 +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 2B9IVcvc024099; Fri, 9 Dec 2022 18:31:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B9IVcI1024098; Fri, 9 Dec 2022 18:31:38 GMT (envelope-from git) Date: Fri, 9 Dec 2022 18:31:38 GMT Message-Id: <202212091831.2B9IVcI1024098@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d212d6ebb4ea - main - vmm: Avoid infinite loop in vcpu_lock_all error case. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d212d6ebb4ea3b3e9c3964c1a6d3f41817e437e1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d212d6ebb4ea3b3e9c3964c1a6d3f41817e437e1 commit d212d6ebb4ea3b3e9c3964c1a6d3f41817e437e1 Author: John Baldwin AuthorDate: 2022-12-09 18:26:49 +0000 Commit: John Baldwin CommitDate: 2022-12-09 18:26:49 +0000 vmm: Avoid infinite loop in vcpu_lock_all error case. Reported by: Coverity (CIDs 1501060,1501071) Reviewed by: corvink, markj, emaste Differential Revision: https://reviews.freebsd.org/D37648 --- sys/amd64/vmm/vmm_dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c index aad4cf893114..98738b1f0692 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -149,7 +149,7 @@ vcpu_lock_all(struct vmmdev_softc *sc) { struct vcpu *vcpu; int error; - uint16_t i, maxcpus; + uint16_t i, j, maxcpus; vm_slock_vcpus(sc->vm); maxcpus = vm_get_maxcpus(sc->vm); @@ -163,11 +163,11 @@ vcpu_lock_all(struct vmmdev_softc *sc) } if (error) { - while (--i >= 0) { - vcpu = vm_vcpu(sc->vm, i); + for (j = 0; j < i; j++) { + vcpu = vm_vcpu(sc->vm, j); if (vcpu == NULL) continue; - vcpu_unlock_one(sc, i, vcpu); + vcpu_unlock_one(sc, j, vcpu); } vm_unlock_vcpus(sc->vm); }