From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 7BBA33DAABB for ; Fri, 24 Jul 2026 09:49:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784886597; cv=none; b=BovfTNFYomo4dvMRITTXOFGA5gEN7Nx+GhMaxq9MVezoemBS2DjqOxD5iL9is30HlHmc45BLifFs+m2JTJZ4Mw4KqhsaaF5HzK84wyP+liykJQt/P+BJT69G/M+ORIWSmYu5iFeumHMk1R7tF+HregJlsS9ciVkos1d8K6AdpGU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784886597; c=relaxed/simple; bh=FIoI34exXMWXi2BXg8YS9G6nrSeG6foZcfBsa8GyokU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f5msUzi4pzjSfBRY68jZnkfTU8F3zJUj5rYScrQwPTruu7pMrfNL/6Rq5gyoS7X0+NQrVLfRbGtfWv0MLuVXQ6eS2FmwyOVMmBHLVT/ykotZQeek775ZPN6rt8mSqVoaKdLSZ3DGjkXakGBYP3Y0Q9Ne1wlssEp7Wz8PwW3ye14= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=XVeBdVp0; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=GnT3mVNF; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="XVeBdVp0"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="GnT3mVNF" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66O9T0rN3785870 for ; Fri, 24 Jul 2026 09:49:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=pSw6yqSgPEi F+OlTlwbrF8Jc4C48hR229uxsm1NP2ts=; b=XVeBdVp0gYVFyE90yx4iH8zHcF0 SBbb9a3EOPfm9/dFQ62O1GuvyQyRy7mzyO619sjLWmybDdDFvSTCqoiCH+hgIIjI PwjdvQV4DkcmzuTIIUd6OtCEld1cnjxXyrvNgCAL0M9HYUYfVK5r8chenCRMJarG lkrILCySR99Cj+9w1UOnrrgOq+EIxwHQd2uvI6nBYrLbk5Mfepvs33CivIp/laUb sxsJhy3d8MC4lWZ7+kYTwl9+Ad9+7V5AoZ8HEF9bOTopwZWfFf3RhMJyp1lUNx+i lNSzP3B7lXOjLWDr5LyhhZGIyDoysRm+dpcnukP0wl3rMtqijlNQlguI6CA== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fm5f682hb-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 24 Jul 2026 09:49:55 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-84859a64079so378019b3a.3 for ; Fri, 24 Jul 2026 02:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784886595; x=1785491395; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=pSw6yqSgPEiF+OlTlwbrF8Jc4C48hR229uxsm1NP2ts=; b=GnT3mVNFhfCIE1zeNZq1Z2buR4x0RZKXlrrDvekDOr/8NWzUogU7rbsR4xSRSBnvZw Mxpf2z+ZNF6yBaobfRUSE1QRduKYA6ZHIKHP7SAccF9d2HYLTDjfhCHu8hIex71LTb+x k2S6v8VZuVXTighja3OAEMVodotbEjazUtQyfgDx8yGEd0ttyM/VldlVwdjbprRgsvFC G8xQ00I4rBAOWYVxBlrbQ3YD4NUsW0rhU+TPRMbigj3urMpNwAQV/XXLO0rG7BSKjllk NYaD2889AW+0GDUeGRSEh6B9x5OZphvQe+GeOmYGJl9w8QztEXLAwLwdq9EQoNogE7U4 6zMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784886595; x=1785491395; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=pSw6yqSgPEiF+OlTlwbrF8Jc4C48hR229uxsm1NP2ts=; b=SlB02lnN8gsTUHG3y9wWx1pa4R+toxldU8UDdcIsNzPKqpdjVJ+cijh8zCcdq5LlMP pyuVmLCvgiSod+9yfPRphSqESN368icSPUUuXBPakI2Vp7KspTkPNWVN6efA7aZsmX4N o2AddCXIiBErjKpoKNF2G6Q/o1S7rLBkcwMJ5NwcOupveguyvot8ka9V3b0gOE3CMnJa taOorp8fi6Cr9QFEaIN9Zom2wKzr5pngm3TC2pQxGUAA1vDQZV9sYEA4sSzGmihOn1tn SMk5iZ/KMiJ3ephOizYTfjBykHqPkxXkEfQnlyXKvHiajaN+NipEWfkz9IBzlW5ZIA4u qrlQ== X-Forwarded-Encrypted: i=1; AHgh+RoHH+Ln/8nw6cik4w+clpYxfTJN4F3gbwnbdV3O99ZjGKulW80u60oE6qY/1j1w83DQ56p2O3PD4+SH6eI=@vger.kernel.org X-Gm-Message-State: AOJu0YytEy0eiXK20VvM5hcLqfkYvv1AvkcqQehWx1TvoIBPsHYhnCQZ a55HkgIesctMJ6mxKwTO9bIVvF7vmyvJlmZulBZateaqjg7Rj064lc6y89CFeCV/GY9nfJWmmLO 1OfY5YbDJXY8zeJZjKIRYtto8EOg8tumxgZIlyU/DQGU+A2NC8mWKBysFRyJCp33pKSU= X-Gm-Gg: AR+sD13P86a1Jkm+yNp7zl6PzZAa13TGIMzodATjoYu3Yvov19J2e8PUYfKdjTMDWqN DBUp4EASNVy5vXgPRgjBbkyCVdGiWsqnnqkxVal3ANXsO6YWEgDCBXcKKXNGFr9miXrsEPT7Bb1 COurLIQRIOZiXbnvwzZr/sjWRbwkbu0l+x4LNFatK083ariSp6QXSXsK8iOmZ14z3jpJ1/1j1W7 huW0AyqFNfE4ZUdAZ9TB/V7RPi1/ZAe6fjKpAV4sZds0CuSnK+MVggV0y/7Ga+LSxd/Xi+b8nSl BO863H9Xha2YmN9ZfW7oZbOdU/xcHNiCz51NMlEGP5dYragZW2TBVkjd/W5E8QpImaympSwKdy9 BIOIFUvHnWqexkKDkLOAeW1htK1U= X-Received: by 2002:a05:6a00:180b:b0:837:e9cc:d474 with SMTP id d2e1a72fcca58-84e2bbece5bmr7258319b3a.2.1784886594800; Fri, 24 Jul 2026 02:49:54 -0700 (PDT) X-Received: by 2002:a05:6a00:180b:b0:837:e9cc:d474 with SMTP id d2e1a72fcca58-84e2bbece5bmr7258289b3a.2.1784886594251; Fri, 24 Jul 2026 02:49:54 -0700 (PDT) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbb8f1a8a7csm3961013a12.24.2026.07.24.02.49.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 02:49:54 -0700 (PDT) From: Mukesh Ojha To: Bjorn Andersson , Konrad Dybcio , Bartosz Golaszewski , Guru Das Srinagesh , Sibi Sankar , Elliot Berman , Andrew Halaney Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Mukesh Ojha , Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v4 2/3] firmware: qcom: scm: Fix reserved memory cleanup on probe failure Date: Fri, 24 Jul 2026 15:19:38 +0530 Message-ID: <20260724094939.613844-3-mukesh.ojha@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260724094939.613844-1-mukesh.ojha@oss.qualcomm.com> References: <20260724094939.613844-1-mukesh.ojha@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI0MDA4OSBTYWx0ZWRfX2ozVKbpqFSXu pbQp63i6c2eLu+3RLhJqlMBFNmxJfjEOs0lpGR/bFVeYxmrjm53aeTGrkajWRmbF5TZgWl8zwvt SfKQtu+pAHaGJjzTA66dv95cqiH+45M= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI0MDA4OSBTYWx0ZWRfX/qe87/6YBupa rmbaxtm3P6LkUqY1XwzX8jrd+9zIHsJXswcguLZk5f4XOkm7yc7V91ilt3e/u5mn3aiXyskti8a dNKqtA8O1qG6LxmL3830GWjxsh1Wye89sR63Yf3frrTFt2gxss4itCWZhuMSOCBrbzaBuXOuKqe MlGZnj1RPvx8FeXVERr+24CcyfptQq9vn8iHA2g8BdsOQHwab7wzFVCqHgE93J06pYllHYuwinF ZpG3tCItOzzObqXMXNLLQEqvjxR7nSY5po45axAMQC8RXYFyXqqtZH7CDON/hOit2X52y1iWt/S +YJvtj6WdqaHOEBBcO3jeXQMSp5WGSD8qoxylLrKVMB+s3NPy2CubfOi2S2N05w0ByTi2MDcE9Q YPa5NGInRO8gve1WPO7aFKGc2LlVIkNuOlEHktTfsPA13ODsVs8WObE1nTTIQDS8i01PRrM3qtV KwGCtf9pg+LcxOxwp8w== X-Proofpoint-GUID: Drrm1UZSollex_JO4kmMNMe5AYGx7LM1 X-Authority-Analysis: v=2.4 cv=BNeDalQG c=1 sm=1 tr=0 ts=6a633543 cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=mag7UKMDEwzM_1C7KTIA:9 a=IoOABgeZipijB_acs4fv:22 X-Proofpoint-ORIG-GUID: Drrm1UZSollex_JO4kmMNMe5AYGx7LM1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-24_01,2026-07-22_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 adultscore=0 phishscore=0 lowpriorityscore=0 malwarescore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607240089 of_reserved_mem_device_init() adds an entry to a global list with no devres counterpart. If qcom_scm_probe() fails after the call the assignment is never cleaned up. A probe retry would add a duplicate entry, leaking the original one permanently. Add an err_rmem label that calls of_reserved_mem_device_release() and route all error paths after of_reserved_mem_device_init() through it. of_reserved_mem_device_release() is safe to call unconditionally as it simply walks an empty list when nothing was assigned. Fixes: a33b2579c8d3 ("firmware: qcom: scm: add support for SHM bridge memory carveout") Reviewed-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio Signed-off-by: Mukesh Ojha --- drivers/firmware/qcom/qcom_scm.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 3b271948d326..9db55240609c 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -2849,9 +2849,11 @@ static int qcom_scm_probe(struct platform_device *pdev) "Failed to setup the reserved memory region for TZ mem\n"); ret = qcom_tzmem_enable(scm->dev); - if (ret) - return dev_err_probe(scm->dev, ret, - "Failed to enable the TrustZone memory allocator\n"); + if (ret) { + ret = dev_err_probe(scm->dev, ret, + "Failed to enable the TrustZone memory allocator\n"); + goto err_rmem; + } memset(&pool_config, 0, sizeof(pool_config)); pool_config.initial_size = 0; @@ -2859,9 +2861,11 @@ static int qcom_scm_probe(struct platform_device *pdev) pool_config.max_size = SZ_256K; scm->mempool = devm_qcom_tzmem_pool_new(scm->dev, &pool_config); - if (IS_ERR(scm->mempool)) - return dev_err_probe(scm->dev, PTR_ERR(scm->mempool), - "Failed to create the SCM memory pool\n"); + if (IS_ERR(scm->mempool)) { + ret = dev_err_probe(scm->dev, PTR_ERR(scm->mempool), + "Failed to create the SCM memory pool\n"); + goto err_rmem; + } ret = qcom_scm_query_waitq_count(scm); scm->wq_cnt = ret < 0 ? QCOM_SCM_DEFAULT_WAITQ_COUNT : ret; @@ -2937,6 +2941,10 @@ static int qcom_scm_probe(struct platform_device *pdev) qcom_scm_gunyah_wdt_init(scm); return 0; + +err_rmem: + of_reserved_mem_device_release(scm->dev); + return ret; } static void qcom_scm_shutdown(struct platform_device *pdev) -- 2.53.0