From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ABD3D2AEE4; Mon, 23 Jun 2025 21:44:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750715060; cv=none; b=mElPiPxJgJsR70bFEQce/nI6ZJqFa+G1bs82FgsmLuTRDad0eNp3ptlyRxXsLypKfuaYWSJMLDaUiQm1/74eMcTvXJsNWCy4yEIrJFBVjKqgI0dhwf/bVolaErqjw2VQ90sL6LbKcau/Jw3DtJncI4Os/RBnhZ8mTC8uZ+rNRiA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750715060; c=relaxed/simple; bh=tGquDvr+w0QixDsgWD7pv1cDNyiauElJi5aG5Zf/UG4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lvhHSVXIDjWzV6bOetTsTo4cd5oqNz6IS74/4XMcNB3Tzc4vHChey9enpWtG2UrPT8SvzZGbln2vhyegeAIxFxpIy5eMjkOfdR7wmWO7pzWcp4fKZ5FIfl9zS6NvNSGYlfZZkcuKRfztlGirUe4ByqJKzXjm9Kf26DL1gq8rpLU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=S/aU1rsH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="S/aU1rsH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3905AC4CEF2; Mon, 23 Jun 2025 21:44:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750715060; bh=tGquDvr+w0QixDsgWD7pv1cDNyiauElJi5aG5Zf/UG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S/aU1rsHSndYTJteHcQT1zUyDm9m514+52yh5iKWe4GZkVQGrRiEwd3qnNZMgTm0R RfJ+fqwkpgnRT1E7z4qW6CyVSe4YDG5DzU/5wsK25XeGBUduHBHr14YRYdh9RdyRKW v42v0u5qqWczvjhw9BKnseZWGTN7e/3QPz5wn7sI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Bjorn Helgaas , Lukas Wunner , Dave Jiang Subject: [PATCH 6.12 153/414] PCI: Fix lock symmetry in pci_slot_unlock() Date: Mon, 23 Jun 2025 15:04:50 +0200 Message-ID: <20250623130645.868891125@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130642.015559452@linuxfoundation.org> References: <20250623130642.015559452@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilpo Järvinen commit f3efb9569b4a21354ef2caf7ab0608a3e14cc6e4 upstream. The commit a4e772898f8b ("PCI: Add missing bridge lock to pci_bus_lock()") made the lock function to call depend on dev->subordinate but left pci_slot_unlock() unmodified creating locking asymmetry compared with pci_slot_lock(). Because of the asymmetric lock handling, the same bridge device is unlocked twice. First pci_bus_unlock() unlocks bus->self and then pci_slot_unlock() will unconditionally unlock the same bridge device. Move pci_dev_unlock() inside an else branch to match the logic in pci_slot_lock(). Fixes: a4e772898f8b ("PCI: Add missing bridge lock to pci_bus_lock()") Signed-off-by: Ilpo Järvinen Signed-off-by: Bjorn Helgaas Reviewed-by: Lukas Wunner Reviewed-by: Dave Jiang Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20250505115412.37628-1-ilpo.jarvinen@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- drivers/pci/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5643,7 +5643,8 @@ static void pci_slot_unlock(struct pci_s continue; if (dev->subordinate) pci_bus_unlock(dev->subordinate); - pci_dev_unlock(dev); + else + pci_dev_unlock(dev); } }