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 4940E343D9D; Tue, 16 Dec 2025 12:12:52 +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=1765887172; cv=none; b=boPCXgAIZPYSJc+jAaXyg6kWwVwVVoMEtohwJsgN3gG+O25wfk/Wx3IYC16v11OHMRWhW38R+uoC9hEOq9GXlxgEn+sU+UrjcTZwD+LSIjUKNMVMPS1lYQINbf3Hgsx+hbCEjVJ5FM3JXDH6/NzSTnmF1bNiH29EWzfhatxoKmk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765887172; c=relaxed/simple; bh=2CIGqTM8+/RB1kVE9pDTes1uromWqpa9HBHU32EtskE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ubVaaTh40jdc6d0szME6p/q6pgfFRyHOyC+DgSbSRNFHuEjYAhl+wGp/tvVe68vPmKKEUPTl+3OQe07XHMfYNlScQ7ZVCcov4jfqiCQoyYt3QpgP+9nY92IL0qu8QJGcOox4jALMCBQR5SoovuYfidio/1D7FXq/pIbKHZVkaQs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jxGr4adQ; 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="jxGr4adQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8D0CC4CEF1; Tue, 16 Dec 2025 12:12:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1765887172; bh=2CIGqTM8+/RB1kVE9pDTes1uromWqpa9HBHU32EtskE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jxGr4adQZoZ86Mkh3LaCcQtN5mgid+DscduBgF4d/q+KwGaGFv8O9LtRcg0RkruqN 9ClE4RqW/YEcP3VXKoKAnx/YkgrzI6HU4tRjL3XipitPwdNOdzmVB9DINbMDkLwB8j tkNseFD5JinYiPBrKZMeKM2tuYQeX2PkdureL2KQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Haotian Zhang , Konrad Dybcio , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.18 149/614] soc: qcom: smem: fix hwspinlock resource leak in probe error paths Date: Tue, 16 Dec 2025 12:08:36 +0100 Message-ID: <20251216111406.734508099@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251216111401.280873349@linuxfoundation.org> References: <20251216111401.280873349@linuxfoundation.org> User-Agent: quilt/0.69 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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haotian Zhang [ Upstream commit dc5db35073a19f6d3c30bea367b551c1a784ef8f ] The hwspinlock acquired via hwspin_lock_request_specific() is not released on several error paths. This results in resource leakage when probe fails. Switch to devm_hwspin_lock_request_specific() to automatically handle cleanup on probe failure. Remove the manual hwspin_lock_free() in qcom_smem_remove() as devm handles it automatically. Fixes: 20bb6c9de1b7 ("soc: qcom: smem: map only partitions used by local HOST") Signed-off-by: Haotian Zhang Reviewed-by: Konrad Dybcio Link: https://lore.kernel.org/r/20251029022733.255-1-vulab@iscas.ac.cn Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/soc/qcom/smem.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c index c4c45f15dca4f..f1d1b5aa5e4db 100644 --- a/drivers/soc/qcom/smem.c +++ b/drivers/soc/qcom/smem.c @@ -1190,7 +1190,7 @@ static int qcom_smem_probe(struct platform_device *pdev) return dev_err_probe(&pdev->dev, hwlock_id, "failed to retrieve hwlock\n"); - smem->hwlock = hwspin_lock_request_specific(hwlock_id); + smem->hwlock = devm_hwspin_lock_request_specific(&pdev->dev, hwlock_id); if (!smem->hwlock) return -ENXIO; @@ -1243,7 +1243,6 @@ static void qcom_smem_remove(struct platform_device *pdev) { platform_device_unregister(__smem->socinfo); - hwspin_lock_free(__smem->hwlock); __smem = NULL; } -- 2.51.0