Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp241091imm; Fri, 13 Jul 2018 23:00:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd7kpHx16UzSUZUhXQjCqxvaWTU+jwmurAnAMD1yfIOf8raZF6gOBLsFRRvIYBdghuMBpsK X-Received: by 2002:a65:620b:: with SMTP id d11-v6mr8654461pgv.429.1531548022909; Fri, 13 Jul 2018 23:00:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531548022; cv=none; d=google.com; s=arc-20160816; b=fAVOp+AyhcNs6ww/xXka3qoBcSKGO1maedbY51GqwXuY1gO9VfsdtuwOJiPKEp4v4i naXcasz4y7UUiZWjSFel6uQr4uj7LIU9QIBNWkcrhiD1K90o7sVlEKnDZytEKMSw+Eej yPFZQDL81bnOcUyDdjiqIGkf15WOYZfd7V9hFZPtSVxEe1LQ+5I912AG0wFZ4mLJtSIf dOrzfGcdsi06dBpogHUtM7YnvOhpp6FmLWuL2nbRIJncqq4Oqq4Clx8RozqKKJPYXkJr qa9CIPfulfVZPRZyozmmxzn1rylhwdCiLSDrC6UmCiQVAnPgMJY2jrN/FzskWV9/aGMD E59w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=gx9z6Wrgu4Yfox5q4ztlpJjirvvil7nXZPI9+apOPSM=; b=srn4ToIZ3keSmsa7cX5/Z8zOlLKthmWcG1qV6xGHcxA2USWL/Q3uxMkHXSsVORMkpp /08KidYPHCK4Yoq0fLH7EHwZ9ev5Kdzrhu4p1mroqLNFFibDEiUs+1A4Xz1WZVkvBkjl E+RzoNl2jGzjilR9kfzvmSW4sb/G2AazD+fljWkAX4MBhJXR31MfzkYHZOzf6PPmKSlV LJNs2y67E5cTedXTboXRTq1PTvETyV1wta6pQCc8KWGphtIbRSOLmntSvHshmPRut5g3 gM8Y8oWouuD9LZ5WVLTs4XNvaeD6emKXS0Kq4w0N/KwnuTlt4BMdwC71eyRdjvG27Jyz aBPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=HrvxjOZf; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b25-v6si17400282pgf.545.2018.07.13.22.59.53; Fri, 13 Jul 2018 23:00:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=HrvxjOZf; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727142AbeGNGQk (ORCPT + 99 others); Sat, 14 Jul 2018 02:16:40 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:38559 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726971AbeGNGQj (ORCPT ); Sat, 14 Jul 2018 02:16:39 -0400 Received: by mail-pf0-f195.google.com with SMTP id v15-v6so3748044pff.5 for ; Fri, 13 Jul 2018 22:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gx9z6Wrgu4Yfox5q4ztlpJjirvvil7nXZPI9+apOPSM=; b=HrvxjOZfRMcsbQDuRX1PxPq6bZqQ7WPOGpAybfzaeysQj8JlfO1iLR5Ec/CXV/rOy4 MrlYAVcgBQUieGHApQT6ZRR/1Q/awKDwK4fBRHQSMcm44MLhIrMvqc61qomSvlmUopK3 pyRIlJMeA0JHGGdqqkwZpz5im+dEOoFf5z0MztjcNpl4NkP53y5PddGjUZYGV5UWu62h E8qoFFzFn41hNHlXoQPVUoQhK48xqHFwGTTUZKFL8XJC8BQprQ2MJ8aaqaxIy5GORiMx DDnfJ7+M3IiG7t0+JxLkeR0TIZ6R+uVjV7Th/ByTFx7YYcWLH4B39PFgvRdgu11Emzi9 aEEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gx9z6Wrgu4Yfox5q4ztlpJjirvvil7nXZPI9+apOPSM=; b=JDSHQ5uvvp1dWthOCWj5szC4h3m05NN587Xp85lIonrnlHzyg/3LemGf1FuFWBRoGR QR4dWYfMTitiqYKziJvyQYLtJdvip37FEBdRY9jfTCQFzp8XUYkFyqBh16FQyJLhNQMJ WiUSaz8ifuVKhRNBmxUlglQuq4CijWfT0khPoYc9DDHPlwyDdmnL+l9c/JTw+N5Uwybo U6hoFiPL0szh28RlBST5pQSSMDT61O1hJM15M6QisLepLIWYJ+4WiqLLZgsDORHndbks wDMxtg5Skgou7ELGiQfYTXZm+zAa0cZZbSq5L4LReFtzb+WSnuXozPU1WAweR5doFNtL JwYw== X-Gm-Message-State: AOUpUlFUtCcaI+/+CY4TtXp6TOkxIKusLQcYBZiAzUp/yBOB8iIZxl94 S/j8isr9251uYqC+czm0eEARrIt8 X-Received: by 2002:a63:2506:: with SMTP id l6-v6mr6731030pgl.237.1531547930259; Fri, 13 Jul 2018 22:58:50 -0700 (PDT) Received: from toddpoynor2.mtv.corp.google.com ([2620:0:1000:3701:7d29:cd13:d903:7908]) by smtp.gmail.com with ESMTPSA id 203-v6sm48411112pgb.14.2018.07.13.22.58.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 22:58:49 -0700 (PDT) From: Todd Poynor To: Rob Springer , John Joseph , Ben Chan , Greg Kroah-Hartman Cc: Zhongze Hu , Simon Que , Dmitry Torokhov , Guenter Roeck , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Todd Poynor Subject: [PATCH 06/18] staging: gasket: fix deadlock in pci driver unregister path Date: Fri, 13 Jul 2018 22:58:04 -0700 Message-Id: <20180714055816.223754-7-toddpoynor@gmail.com> X-Mailer: git-send-email 2.18.0.203.gfac676dfb9-goog In-Reply-To: <20180714055816.223754-1-toddpoynor@gmail.com> References: <20180714055816.223754-1-toddpoynor@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Todd Poynor g_mutex held across pci_unregister_driver() call, also held in gasket_pci_remove(), which deadlocks. Reported-by: Dmitry Torokhov Signed-off-by: Zhongze Hu Signed-off-by: Todd Poynor --- drivers/staging/gasket/gasket_core.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/gasket/gasket_core.c b/drivers/staging/gasket/gasket_core.c index 3bdf7d36b397..6d240dc59557 100644 --- a/drivers/staging/gasket/gasket_core.c +++ b/drivers/staging/gasket/gasket_core.c @@ -668,13 +668,10 @@ static void gasket_pci_remove(struct pci_dev *pci_dev) struct gasket_dev *gasket_dev = NULL; const struct gasket_driver_desc *driver_desc; /* Find the device desc. */ - mutex_lock(&g_mutex); + __must_hold(&g_mutex); internal_desc = lookup_internal_desc(pci_dev); - if (!internal_desc) { - mutex_unlock(&g_mutex); + if (!internal_desc) return; - } - mutex_unlock(&g_mutex); driver_desc = internal_desc->driver_desc; -- 2.18.0.203.gfac676dfb9-goog