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 7607541A4FA for ; Fri, 24 Jul 2026 18:29:18 +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=1784917760; cv=none; b=Pyt6dkl0sQe/2YjNkyEIjTwff+vkkIL0d4xABvcX2Lfb/oH/5S+YW7DCmBVhaY8Sr0xptdfeQiwJ1VgijAFSjhu4UzlxXaIpxPJxJo9JG6J2gIZoSfvXxu3tj9PIpOwS3yMlCyPjbosUKRR5L3NmFWP7tKZHbC9Tc8e4UpBJOGQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784917760; c=relaxed/simple; bh=DY8VFqJjyMky+pruQfRM5PAcQO10FyR8Wx2ZfO+d6cM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cSXIz/SQU4v/aYfyGM1lUmZCll0nJsvcGeZHGZ85Jm7Rycc2P8bawy7VaCcXMsNNYMG4yaPvjHc9utdPp7J/WrohjojfvfDZE0EvJE5ILNE3Tl0fOJUiJ7ujjELGDMRxbDyHHGjyGpz8yzarJy4OiASpMVkACqviA0F4zicoltw= 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=bTxgvFX8; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=CM+QubMH; 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="bTxgvFX8"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="CM+QubMH" 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 66OGqQP2594616 for ; Fri, 24 Jul 2026 18:29:17 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=j5emzuRgACX 9a1cgqepsrcMt9zKe22Qqa2hBXKHbruc=; b=bTxgvFX8NKX5eDXxqIaBpXp0ciQ BGc0fryJenJH5LAVyBAQEyawLfJou8zs+DYflyC4RDR1qDT1WKcA5i7MI1AMhEMU lYLYlua6JYvBA47wCavq3zv2G3jMh+brLKlg6Wm1HMz5RW3MqFkCWRPhnmjaqZj3 /Wjs3F1bU5EffYZCTIwDAYxazOH9OegI6T2WTzs9yvpHgQ3p/Pc01VMgvG/2sWKG TUKYb4FShIpFL+3fS8Hn8h6banQ+qQAAe1TTsVbUTXHC1c8QVUSrPOg7oGiLzcq4 BQekU7Yqhw/NGAJeht+Xk1ulY0jjf3LHuicMgzp2kkq57Ns+azzrlqshzAA== Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fm8ck96n4-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 24 Jul 2026 18:29:17 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-cb7d6ba548eso824878a12.1 for ; Fri, 24 Jul 2026 11:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784917757; x=1785522557; 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=j5emzuRgACX9a1cgqepsrcMt9zKe22Qqa2hBXKHbruc=; b=CM+QubMH5EImzK79Riq/9SyQdbiN1t27mW5tRtMwh54dI3WgK5t9TMRTRyzZuDMRrM geceWOrWU2idZeJh/hp2xKefJIt+ZDivlimmblOlDJy4xmLQcCc+9sXIO0QpAGaDU+aw N2UrR5NHBowQ6wOEDMrHQZ7TisXxuMjGLkfAIVErqGL4yIn34l0PKlF3rMmAMDpt9TYV 36sx/ZdQcBFmbpEEmqrJqLsTFxaaLlG8mNbf9rsSdArRmAFJ2t2FqS2888kD1cubVgma PEnCj3dJLUyT7iZQTnEQSpiT5nFHuFmQs2F7BdqHXK++DTq/YM96k91qM7grBISRzxsw mhSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784917757; x=1785522557; 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=j5emzuRgACX9a1cgqepsrcMt9zKe22Qqa2hBXKHbruc=; b=Goc/m3NcekivYaOcqoP+MzMHzOIzm98NyfbrM5gedaGIBBpISYaHJ8NKBRPK1VkNYf y5t+OWRt9N2aMkB7k45qcE2Grp3EUW1Wu0ia5PX96IaswEcoEHnzU2mGyn9xsMw6hZvm LoHZu6Fcebl2FgnYP++eZsCHOlhkwWX51afyPl63CtZjwqSZ9RaPV8Y/y+a7bPGeq+Pg 5ZXRtOivjlzV8N9N1rpef3mK8KLSajDpdkmSN20tggJCy7oHvpxQ/exvW1AEYUW28ah/ vwansgWqIJu1ukNtGu7V9NIJaRjvw7u7paip9y9/PXc5vkgn0ieJ5rD3sf9M18SIe9Hv 4awQ== X-Forwarded-Encrypted: i=1; AHgh+RrezF9m6+marfU7trmJKHg2SFXOzIT+vvuEgEXXcWY2R3R3TScrHfnk7umWzPrlf9IQiYmtrrZlSVUXl/M=@vger.kernel.org X-Gm-Message-State: AOJu0Yxl+AmqU8xmm+kdeEhCb1GQhogXw7KQ8luOTEvKoI30Fx1EguQO +wmzL04FM1XHd/RfCb7bUUpHs+vYZEWdJRzABJE037HzkFAZd0GtM5uI1wrX9B3/Z42ND7CJXVw k8Y2nFClaO1tsYp/wPjg0HNgl1uIjTtESZh7SfMoJrQmVBAkrNBJeFIYit29T6UNQfyk= X-Gm-Gg: AR+sD13nGP4Y6BZeDnycy/scZK7+86MnguNvat7CVJqW2l6wctoaiCMmyCVUWlB/cDa RFG1PngYCXLfM8uBczOB8nr3iDFXAoMziVAaDib+fcqgVZ8e/iWuRBaspwCmNHxl2OVZYM/YG+F 4X38BBWeEeqrxlTzbORb5OURAe7xHd9Ue2BK7pXlVdValMvVr7KldiddDW6gXELMG9vQ+niLabf /pr8EPUy9UKf8uPM/AK5z2N76q/RnG6gRBIGx7XlmSGXSWDEXdyfv6GKo2zskSGI46xY6PBexVY uLCtap3SDU/ICZYBT7HwNyOqpw4o0lhBYdHt5pD9Ys4VN2FyFIMPdIlV52JtTDlB8u800rBtTlY 0k/gLBCgj4nKdLMfDsq3W9JOkb4Q= X-Received: by 2002:a05:6a21:a347:b0:3c0:9c1a:8941 with SMTP id adf61e73a8af0-3c44b2c1b51mr8939955637.73.1784917756885; Fri, 24 Jul 2026 11:29:16 -0700 (PDT) X-Received: by 2002:a05:6a21:a347:b0:3c0:9c1a:8941 with SMTP id adf61e73a8af0-3c44b2c1b51mr8939936637.73.1784917756355; Fri, 24 Jul 2026 11:29:16 -0700 (PDT) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-314bc5c53f3sm1341510eec.30.2026.07.24.11.29.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 11:29:15 -0700 (PDT) From: Mukesh Ojha To: Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Sumit Garg , Neil Armstrong Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org, Mukesh Ojha , Konrad Dybcio , stable@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH v5 2/6] remoteproc: qcom: pas: Guard dtb metadata release with dtb_pas_id check Date: Fri, 24 Jul 2026 23:58:54 +0530 Message-ID: <20260724182858.1868271-3-mukesh.ojha@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260724182858.1868271-1-mukesh.ojha@oss.qualcomm.com> References: <20260724182858.1868271-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-Details-Enc: AW1haW4tMjYwNzI0MDE2NiBTYWx0ZWRfX2hyXg1a7/1mK LI5vUf7eswg5GFK8f8JvuXHNTa9LWzH+fSBtMCOaTiHHvuTTyowoN5ePAfEQwPM8AgR9xUj3WjJ unnL+bAKZZmDxZf8J4MBV6eQugcb0lRv540fOF8bojjBavuk5WF97DCvmAnFwU+BjPCQCzO9bbc oquqivdyu4LZ0sHv6ZK29ySGwhOJ7mf8rX22dshibGN1DJQsezdkz5b2D0nMjugRQYQJc6+RS2G W1Ovmcaw2DJ7DJZfAQLYvg3Hc7IvXIxzshHWMu1p6Cm/x8ojCOSBn/ry7P/GLzGsHa355ur1hAr x3wZpkoWdqgh5cYOHI7uVWZCy4AoQBoy246LDraXNq4A7Nd2tfreShQmKzzPduv3/Zdvg9fa1sO suJUNVzvlTHTUulTR1xLvj9iBes2LFK0Ap6wXjxls+9Rb/ZRReQ4iykf0YDFLq8cdex0W+bQTnA H/a6EvgbBEpalmW70HA== X-Proofpoint-GUID: 41r3D6-WtR0-GYLkyaN99KzOSYywE-2o X-Proofpoint-ORIG-GUID: 41r3D6-WtR0-GYLkyaN99KzOSYywE-2o X-Authority-Analysis: v=2.4 cv=F79nsKhN c=1 sm=1 tr=0 ts=6a63aefd cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==: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=VwQbUJbxAAAA:8 a=Td1J0TjYGYW-NjyS66IA:9 a=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI0MDE2NiBTYWx0ZWRfX2FJ/My1tzRD3 v/gH9lUAzS9/A2rr7MKX4ZigvQN3ttVBWIRtXl84dtH6elB4f9SSsVNvWw2XUc2TxA2X4Mbn70z 5QBxJyr1xcmiTNabCNlYHpbwdipJG0s= 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_04,2026-07-24_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 adultscore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 suspectscore=0 spamscore=0 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607240166 All other call sites of qcom_scm_pas_metadata_release() for the DTB context are guarded by a check on pas->dtb_pas_id, but the call inside qcom_pas_load() was not. Fix this by moving the call to the guarded block. Reviewed-by: Konrad Dybcio Fixes: 29814986b82e ("remoteproc: qcom_q6v5_pas: add support for dtb co-firmware loading") Cc: stable@vger.kernel.org Reviewed-by: Dmitry Baryshkov Signed-off-by: Mukesh Ojha --- drivers/remoteproc/qcom_q6v5_pas.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 9076c82ac878..f70836cc382d 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -245,17 +245,14 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw) ret = qcom_mdt_pas_load(pas->dtb_pas_ctx, pas->dtb_firmware, pas->dtb_firmware_name, (__force void *)pas->dtb_mem_region, &pas->dtb_mem_reloc); - if (ret) - goto release_dtb_metadata; + if (ret) { + qcom_pas_metadata_release(pas->dtb_pas_ctx); + release_firmware(pas->dtb_firmware); + return ret; + } } return 0; - -release_dtb_metadata: - qcom_pas_metadata_release(pas->dtb_pas_ctx); - release_firmware(pas->dtb_firmware); - - return ret; } static void qcom_pas_unmap_carveout(struct rproc *rproc, phys_addr_t mem_phys, size_t size) -- 2.53.0