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 1107222688C; Mon, 23 Jun 2025 22:18:44 +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=1750717124; cv=none; b=Dvvl9DoXO+IGxucsW8ruDRVoOw3/lQYn6ZsMXvz390mx0ulC7pjOFgFiwO6K2etwfKJKZy1v1GFVwfY3O5DA4nQ5Rd/qQvQGVKwgsiaRd2eltcFA9bZiDfmIACU1tKl4qJpTkWzaL/3+TZqvYuUhpA51dat2jOEWqQ47trFKHGc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750717124; c=relaxed/simple; bh=i9uB+LT8GTDO6B0E7pNFjrkLXsrT7O/RUFaHKoH7HXI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bpSqWygg+jbEb+yJlBgM2mEsWbq41grwWS3jW4LxKxtYe/oVYw5RMuNXh0lJ6r/+HrKaMxE43Rttm42fM//iWT9xyiUKGuhMf8jmSRtPW9IbGY/fnAvr8HQFW8Wh4HzGabwKnCg36/wYlHFRpNXG4ghzq36P7d8GACIqz3PCT0w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hF1kbXOs; 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="hF1kbXOs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9CDEBC4CEF6; Mon, 23 Jun 2025 22:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750717123; bh=i9uB+LT8GTDO6B0E7pNFjrkLXsrT7O/RUFaHKoH7HXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hF1kbXOstsnylr3lgoP4FvI6QDEEPmUsyfkP5aHymQ4gYpDCqF7BYFWUl+/KdGEec L4g6vcR1yMZHhY2KyLyAKp3eJc3EQpGywM0pzBA2nvm4dMWtnZvfjKdt3IhXFxUsSJ RZ2vcEJVVZLjH9ozr1VVRsrzCMPfLVVyxgUj/Fng= 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.1 369/508] PCI: Fix lock symmetry in pci_slot_unlock() Date: Mon, 23 Jun 2025 15:06:54 +0200 Message-ID: <20250623130654.425585581@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130645.255320792@linuxfoundation.org> References: <20250623130645.255320792@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.1-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 @@ -5687,7 +5687,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); } }