From nobody Wed Jul 12 16:17:17 2023 X-Original-To: dev-commits-src-main@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 4R1NDZ0gsXz4nFfV; Wed, 12 Jul 2023 16:17:18 +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 4R1NDY75Kcz44SG; Wed, 12 Jul 2023 16:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689178638; 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=QuD6k87Nit8ymSDFBQmfgw7Um597h3yhKPsHfg2vATI=; b=mepvhxLOA3vzOhTSbYCvMPcHTMJzvnBLUuJyCcc7b674wMhIqLBFOrxQt8qasqdkLt3pHc j3XqHw1G2PuuAM9UeIcgUpBb52p6vUjvs+EIUL62vAO+7NoqC44FI9Y6NLuJnUDZZaCBs7 JloxEpGGmSGTKDv7oornfh8kzvh0a+JRSH46LbJV+Iqy5Z6YY+DFOjDn0c8wwWoRri/fO/ /8Mo8TXBwhaIO2UdTRwgfMQNRQs/YYS3YNSMhpCeQ/ti97Igtfst+JDvhbIIxo9akpHpLi gt+qwny919nTi+pmL1sWh/3WX/gtpd7ecSrMhcxqrNTRihimbh5dbOkipNY0KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689178638; 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=QuD6k87Nit8ymSDFBQmfgw7Um597h3yhKPsHfg2vATI=; b=Fu+VNnmlJwfXXLsN7vrrcCxuQORvtn8i5n6WIcExyMwLfUQajZsxYoxQHVYuz3yI132BTV 0yv7QIKYaFsDIpOSXve0SbxzKBMS7wyWpV9IF+S6s4dtLcR/BuUPTyQFZHLzRV4bzE/KuC DZDewpcmyah9Ar2+xvvVhN9T+EYoI3H+WEbmVYYGCDimO1A9yejCKY2KPb1tvQW31C5IuP q783e/dI6IpPa0cnShODPGDSJiQi/Usm1Fv0Z9dqn1IH2zY7nAoIoxOaGxkY7i5BxRp/6s 3kA6gSwU/F/by2h/OSGU/SARuY2ouZ4OL3l2qfXuEgLM/KdlrikM6FjnBSe05g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689178638; a=rsa-sha256; cv=none; b=EvEBUt6pDFFWYqtBxSCTeutKkC1GgvpwPrjKTAmBazgAXeP/GWUgN/2ONCmhHNUArQHAy2 iPnf33L4+ETZbGFpXr7g7ErCkQIc7eT0Nq1AyFmHmradc8OflMj6O51GS9escz94m68GYK esgqegXSfMo1akjeUOGt1jHlhWF3FX8OT55xFbcLIfIK3gh+RhtGsN0ILj9uhEvRlafQRr gIOSdK+geLO5db5g+SaibkAKn9VwSm8FncZYZhEEdMlZT+3DPnOyM1r5fr5EY2WCpMC1hV oc2WMCf4mYT4J1O+xfdAciR5woEdBzUOZha4xfhVCyZqc9AcfBx7fAL7i7FcIw== 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 4R1NDY5zQhzFlK; Wed, 12 Jul 2023 16:17:17 +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 36CGHHOn010932; Wed, 12 Jul 2023 16:17:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CGHHlP010931; Wed, 12 Jul 2023 16:17:17 GMT (envelope-from git) Date: Wed, 12 Jul 2023 16:17:17 GMT Message-Id: <202307121617.36CGHHlP010931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 0d1ff2b04d27 - main - vmm: don't leak locks exiting vmmdev_ioctl() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d1ff2b04d27c21bf7f66a0b1aaade817ed271e5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0d1ff2b04d27c21bf7f66a0b1aaade817ed271e5 commit 0d1ff2b04d27c21bf7f66a0b1aaade817ed271e5 Author: Gleb Smirnoff AuthorDate: 2023-07-12 16:16:40 +0000 Commit: Gleb Smirnoff CommitDate: 2023-07-12 16:16:40 +0000 vmm: don't leak locks exiting vmmdev_ioctl() At least an error from vcpu_lock_all() at line 553 would leak memseg lock. There might be other cases as well. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D40981 --- sys/amd64/vmm/vmm_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c index 74c751d7f116..dabcd4393a3f 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -1083,6 +1083,7 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, break; } +done: if (vcpus_locked == SINGLE) vcpu_unlock_one(sc, vcpuid, vcpu); else if (vcpus_locked == ALL) @@ -1090,7 +1091,6 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, if (memsegs_locked) vm_unlock_memsegs(sc->vm); -done: /* * Make sure that no handler returns a kernel-internal * error value to userspace.