From nobody Wed Sep 11 08:44:37 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 4X3Yz93bsQz5W7mT; Wed, 11 Sep 2024 08:44:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X3Yz92qFVz41cr; Wed, 11 Sep 2024 08:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726044277; 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=ie3ttZ4ZdB0nYqaG+TT4BVZfwrhVJD6ens2C98Cc/LQ=; b=sVjQOFloXKTiPhMrUTEtuyfBtT+3glOT6DshpJmBfUYEhZQZIcy9LTaHgFrjPYRmookAC9 ysx1E1tSOLQ4cQKt/OTYXOcMM+zmYvz7BaUIrayzIhx6oAVahR1osum/Mx1aW3hO8j+O05 6EY57TXynQeguAGlCVTGIu7DQHKkwk3VIGaND2T6P1N8MVlGc5m06XwsL66pJ+2yVrzMws YoO+ZHC5sUtQu4nhAW1oQk8U6FTDGaLHXzoQSprAHQ4sN2pW1kNypneIubrFp+DI/e1BzI O5EUt55XsG1fuJhH+52AR4WBgGPYxyGKUgHgOp9i8ZLOdpG/nAeNQIKLhzktaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726044277; a=rsa-sha256; cv=none; b=j1jwNm9OldWTFxi/PzNIazExsqeCdtufGRLC4n0vbh/9qORTGe9cN6J4saBQwHRcoFI7km MBgixSdwq6PNHtcEAPfF3Y6MPMnw6oSg4n21xbhUcSxEMqeQwuifEBDqEMz+5Xk91V7bgM QCUW7dGRC5SUxBK4nCZel1K8zVg2GbP1pWVeRhUOLGwaAWeBG2pqLXDv1Ln/KAcVd2pFt2 FntEhlk7eF7r8ngEvZ/7urQL2tzrX9wep2USgELFj3Nh8AX31BBkaJEpdD6lDw4Cq2NUcR mSS5TIDp6pXh0yxataoZUv09YoZ8YFceSEi7sj1Y3oMJBoHeHWWLMpGGCYOfZg== 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=1726044277; 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=ie3ttZ4ZdB0nYqaG+TT4BVZfwrhVJD6ens2C98Cc/LQ=; b=p1AjpdojA2+nZUDFLBepoWmGTkTDKE2DNv09GSch55W46DXrulRj7yarpt/w8gMYymhIAV JgBmXxL+IwL0GJDHTRld0ivt/st8D6+ves81q1RyhrYhlpx9U70yNAi5rr6N3LKkTJuxnz 8BgGx+Dn+XCmnVbOR95Wt5U/YRm51tlyd02VQODGmVcbwZIBYZ1ckP+WPkp3hBMGjqRD43 f3hxn6MPsnP+qEGH+H8Gz1DMAndIabEEOly/Zj4eE+/se/+q8tC0APSGmSzEvZYGr/F4mE 8l+bGwb5SVr5G10LqDaxpJ4dInZNgQLGarqkfF32mwwO9dggOo0CyFZUeDhkrw== 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 4X3Yz92FyGzP9n; Wed, 11 Sep 2024 08:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48B8ibEO008095; Wed, 11 Sep 2024 08:44:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48B8ibOF008092; Wed, 11 Sep 2024 08:44:37 GMT (envelope-from git) Date: Wed, 11 Sep 2024 08:44:37 GMT Message-Id: <202409110844.48B8ibOF008092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3ff2b417a0c1 - stable/14 - msi_alloc(): do not leak msi_lock in error case 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3ff2b417a0c193379a982b9b95e1d52456c0efe3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3ff2b417a0c193379a982b9b95e1d52456c0efe3 commit 3ff2b417a0c193379a982b9b95e1d52456c0efe3 Author: Konstantin Belousov AuthorDate: 2024-08-27 02:28:10 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-11 08:44:00 +0000 msi_alloc(): do not leak msi_lock in error case (cherry picked from commit 5681ddfd9f80c3aa25f900a1bcaa69b36a4e9e27) --- sys/x86/x86/msi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 888635cba3f4..177bd7868ec4 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -480,6 +480,7 @@ again: if (error != 0) { for (i = 0; i < count; i++) apic_free_vector(cpu, vector + i, irqs[i]); + mtx_unlock(&msi_lock); free(mirqs, M_MSI); return (error); }