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 0632F1514DC; Tue, 2 Jul 2024 17:28:47 +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=1719941328; cv=none; b=p3TdWXMoJnT14d78NNCribhuyBBYZediVrRWCOkrTlM3rbzD73RfSwArUQMXwSRxVfzZ3/PyzCDtjPJCSvxj2P01VNruxh/YUHqHnuZj6L5s81/JIFdBFsm+rAEykx3UvlXR3FieN7N2FEjDrQxfIVvy1miHskKYi+imVIwwOsk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719941328; c=relaxed/simple; bh=Unhs/sxQdeb0Z8FV/Qlwv+ScKe0rM6eYTqnDEU7S2Ds=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DFSWUFKiW+Xhfgiu/n9ZsDooRiSUc5Eh263DI6V5MsjOU1xMVoIMkr3up+MHKFubnBtF7uA1EHgH9Z8Q2vs/VptDQZH1VYkFH+aP0fcqlMYehFyRQ4NgoF9PqA4fO5YER/ZcWgsVTmXZktmXFSsK/OVgmsntHI6qky5hadt1zJ4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mFrC/uzy; 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="mFrC/uzy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FD65C116B1; Tue, 2 Jul 2024 17:28:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719941327; bh=Unhs/sxQdeb0Z8FV/Qlwv+ScKe0rM6eYTqnDEU7S2Ds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mFrC/uzymLkzeywoY3NFbwMpKEpAo+QYcL25Il0qqW9Ew6xTzkwvHVVMVoS5kjb9z exh6Hh22XiITMy9ZHmSEGmqoEKZWEdX0o6KAJGUkOlj/Gjhb2vDX9PjnEOuZiQB7ID mAkDuB6yv70sRf95PP/Q9hW3tu0srr0PbBjfGwpY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Maximilian Heyne , Hagar Hemdan , Linus Walleij , Sasha Levin Subject: [PATCH 6.1 007/128] pinctrl: fix deadlock in create_pinctrl() when handling -EPROBE_DEFER Date: Tue, 2 Jul 2024 19:03:28 +0200 Message-ID: <20240702170226.513461654@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702170226.231899085@linuxfoundation.org> References: <20240702170226.231899085@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hagar Hemdan [ Upstream commit adec57ff8e66aee632f3dd1f93787c13d112b7a1 ] In create_pinctrl(), pinctrl_maps_mutex is acquired before calling add_setting(). If add_setting() returns -EPROBE_DEFER, create_pinctrl() calls pinctrl_free(). However, pinctrl_free() attempts to acquire pinctrl_maps_mutex, which is already held by create_pinctrl(), leading to a potential deadlock. This patch resolves the issue by releasing pinctrl_maps_mutex before calling pinctrl_free(), preventing the deadlock. This bug was discovered and resolved using Coverity Static Analysis Security Testing (SAST) by Synopsys, Inc. Fixes: 42fed7ba44e4 ("pinctrl: move subsystem mutex to pinctrl_dev struct") Suggested-by: Maximilian Heyne Signed-off-by: Hagar Hemdan Link: https://lore.kernel.org/r/20240604085838.3344-1-hagarhem@amazon.com Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 223482584f54f..db5fc55a5c964 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -1092,8 +1092,8 @@ static struct pinctrl *create_pinctrl(struct device *dev, * an -EPROBE_DEFER later, as that is the worst case. */ if (ret == -EPROBE_DEFER) { - pinctrl_free(p, false); mutex_unlock(&pinctrl_maps_mutex); + pinctrl_free(p, false); return ERR_PTR(ret); } } -- 2.43.0