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 1557C40FDAC for ; Mon, 29 Jun 2026 14:18:06 +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=1782742687; cv=none; b=XM2pet/Y649xpndvin3HRnzptoNx/MzpjCyyn4vt5HTAFZi27bTzpQ/ZZDWPd7A7ouVg/3u8+lgzSe/yMaLFCuGQQpDJwUh/SNTqa0QnQQVDvTQjWJ0m0ANzdRyh7EuDeRiSJYo2hnWhYyX2buvgXVVLfUn2bJE1X6F7NupfYaw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782742687; c=relaxed/simple; bh=9lUfAtl/sQFaXDsYhccTxCgLS8umK99dvY1EWVrstfA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e3OWtNofMJAuV/Xs/PKPENod1wUPb8torxOEWekjlWZ0cO4g18GXfs2l7sBQrjGQFeAkLlDq8RlLEAtnzWUp/r/f0egS28l4LIOJLKBqoLyKat33mQZmV6Nstqg882D/3JI9W+OtHggeX1JeQOR8ch+o3qsWowtQMrQU2+KQgfs= 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=QlDxqecb; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=IpVPy8dV; 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="QlDxqecb"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="IpVPy8dV" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65TATE582579139 for ; Mon, 29 Jun 2026 14:18:05 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=sagDdptnBLV W0Yl1kvH9vzmHx2hz0XSL0gf5c3pGFuA=; b=QlDxqecbP2sHAtXaXFHL5MMlhSs rtufsYz3kdQ9KHPz00kqBCuG80elBSoco8GtbE8t1epArwenS+YrX4InEdqAux2a nJxvMKJHEAKy5qd1ONYRBme+jnw4dwNOHrityYVRPdLnRKs650cA9QJexKCpSzMb Tztq3FV95gjUh4c24ni+lIBH73vMzjd99pvEjgGHZuVgt6FcrAuJzwfW2a3KSmmA uFpWEt/0Ywu79L6UgQB0u0ljA+m5v3WsU9/P99D4XZlsS2LZjmok5Px/k0DcjkXA vDUoNCRXLu+1RNKn6lkcNASMH6hIT+bayj/ljesAHdtFph4Y2gPUsckwRVA== Received: from mail-oo1-f69.google.com (mail-oo1-f69.google.com [209.85.161.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f3kp7hr4k-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 29 Jun 2026 14:18:05 +0000 (GMT) Received: by mail-oo1-f69.google.com with SMTP id 006d021491bc7-6a0e8ca12b5so2960882eaf.0 for ; Mon, 29 Jun 2026 07:18:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782742684; x=1783347484; 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; bh=sagDdptnBLVW0Yl1kvH9vzmHx2hz0XSL0gf5c3pGFuA=; b=IpVPy8dVFcKtGUsLVB01LunBZvu4T4JXZjIBzZdc+HInomJi8wXlpcgx4IKJeeD1nv qEfmBcvqtq6jmsRmFbVkBpzurlkhYPjGTJ1Q19O1iF6xf5wbCe49lOo9fUqIeJNT8oJC zI7bQ/uUQ9QM1A5R0eGPTJ+/jm4XHWx67wyMK3VxYKg66WSxzTs9kHxwRGB0rTh84ovS bKAPhVHO2g3dAgPeYCse9Gbg0mmJjsB4W3RmoT8zjmQxw86btwkFgtXXw4ScOmQBHArK Xcvtt2GQV543I1LYfx9cnvF9V4AVJMrr6d/y/7BLAoWNySNM18xZ9Ju1ab6z0DcI7KzA ixuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782742684; x=1783347484; 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; bh=sagDdptnBLVW0Yl1kvH9vzmHx2hz0XSL0gf5c3pGFuA=; b=fUHEwCJ1zx1kOICHYNfxxomQXpUt0i7irZ5+d4tQ5PZUZeFCxzwCyd4pWvbLfHHJPU TM8SOhLy3EezvkcwqgdxEbAjnfZwSHd9pR9xJcoQXh81szlyOywCNJQ57t3Rr20QquGq 6naqmfhXqH4Y6z/NzyHX2ScttzTaPyb7gLrjbUJUgwe1SVlgtNw4uyQZCyhK8Ov8K07J RH0V7rwHIpFuK+8E3oef/CB7qWGiDvFen5P9lwHBmGUz9spmqDZsZgnmcVJInjdP8wpn cg7QGSWMBJC5uli4GHpMb6Rn4K09YFURsyhRUU7c/4YewOKBZ3muArFyoLhExJk2DCVT xEPw== X-Forwarded-Encrypted: i=1; AFNElJ8qRVy+GORsdC/zD5n/9WqsuNaPVu/wUiIFQlUsusJGUqJbQHDXbuP1VVgzMXtvN2AcY15Zv+o9dN8nN4E=@vger.kernel.org X-Gm-Message-State: AOJu0Ywon5E7+Bsx2n5ZNAwLPZpUd78UNCfcZUcH6YKHnGW+QlC0oEHE MQQ8CrMHZfkrdvXhpoaggUcM2XwTZ9wvSKqQ9K2lYCtF3rZBYkw8iFT5YImTBAaRMAd318FsL1x 5V7x5MICXRmDZW/1aLBJW3dLC0b7oUpu4xypSe6FkC7lSRg9WE5ATNDfIM94Zd1j4sQ9bSTJHcu A= X-Gm-Gg: AfdE7cny0SCD6niEp/ZQX9rvvkmMnOQ7ZM0niW3Uz+j4JdVPSvCQ5T3asQc454Q1o8K KtCB5z6PPdU2+2GUKyaPhK/u+JNZc/YmZvqt4B4hxgfOrrFYhL954AfCSY/odAf2UV31PNeJsAt 0z/FBU/0RXtaRsve3n68pjz0l7xOC7FzMxf3z15y7+Ps8KLXDTjEZbU1j2tLt8+1FhnwDWm+V3H OzEnEhblmg3jBkVjifM/9+a8GVL1J5/gCC2VIN2qz+Wc42QbLVVpoVZviwxQDQetmL6vmrXweqo 6WMj+lOE8abH21jzb8QHCDLYZR8vYhx5tMEjstdNxpOGn0WvEflR2NA10BukYOXqNaXdGv2OaWI TiwJDfztJyQAiy2x9i4f4r3XCPWPeDv4DI0JIqw== X-Received: by 2002:a05:6820:4b0a:b0:6a1:50e7:5c1c with SMTP id 006d021491bc7-6a150e75d4dmr6848307eaf.71.1782742682874; Mon, 29 Jun 2026 07:18:02 -0700 (PDT) X-Received: by 2002:a05:6820:4b0a:b0:6a1:50e7:5c1c with SMTP id 006d021491bc7-6a150e75d4dmr6848271eaf.71.1782742682242; Mon, 29 Jun 2026 07:18:02 -0700 (PDT) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7e9e8228746sm647612a34.20.2026.06.29.07.17.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 07:18:01 -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 Subject: [PATCH v2 1/3] firmware: qcom: scm: Fix NULL dereference in IRQ handler before __scm is published Date: Mon, 29 Jun 2026 19:47:48 +0530 Message-ID: <20260629141750.996853-2-mukesh.ojha@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260629141750.996853-1-mukesh.ojha@oss.qualcomm.com> References: <20260629141750.996853-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: AW1haW4tMjYwNjI5MDExOSBTYWx0ZWRfX9dzd603TYBM5 yWiv1CUdVfMarRdEMD3HQS7/+lMYn1S6Z2FnJ1RIgh9SSfRLIvTbtDu8qLeyo/MgekImL0Ow+Qq Vr1ofj1BtNIkaslLVxg/L8hZamaHXNk= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjI5MDExOSBTYWx0ZWRfX3vahrrX0fbRv 94HOmDKuT/F6ztDNIuL68Tu3i6m8FFUTmnCxFjR6kxG1Et4p+cuw5v45Za6ePXXAf8KMcTkBpBB pBDGQYYqVC0ye7UsC0ZpDVJUyLPBEG42Q00Np2sGIGtqCLz8sBx9IwtfZ6UQ90Dfi+bF277SfTK tJbsFnm/gbUJqhvYValHlnMWdrxIsJ5hgGdWiUPeGinaahpNF9mwoboifCQsPUYrSHQ/4AVVdpe c61HVyWTObbWsO2zG9XJbfiB1m+vgVV7JIgsrlVBCeiD1RbKv8wJ+Qo2ltwzxlzmVtSNnQlSoi6 4p89a7DL0AkyU4gHHWTk24eJ/ErESobQ82v53htsoBwgAYRyzm4lFVsdbNWVzdSrSWa6Lbkgk/u +xITshWyqCCBg3l6rGJoRRMAJ9z+4XE1DNKdmqtQsNxs+r/TFw6pRIpk90Fz2YoS/RNLi+Sk7br r0W7igD/2G1YkUAVusQ== X-Proofpoint-ORIG-GUID: xA_vL9-yjddfAguEywW95HNTxX6-b7SW X-Authority-Analysis: v=2.4 cv=MZJcfZ/f c=1 sm=1 tr=0 ts=6a427e9d cx=c_pps a=lVi5GcDxkcJcfCmEjVJoaw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=oeUS87UVm4c7YcJ927QA:9 a=rBiNkAWo9uy_4UTK5NWh:22 X-Proofpoint-GUID: xA_vL9-yjddfAguEywW95HNTxX6-b7SW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-29_03,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 clxscore=1015 phishscore=0 bulkscore=0 impostorscore=0 spamscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606290119 In qcom_scm_probe(), devm_request_threaded_irq() is called before smp_store_release(&__scm, scm). Two paths can dereference __scm before it is published, both causing a NULL pointer dereference. The IRQ handler receives scm via its data argument but passes only wq_ctx to qcom_scm_waitq_wakeup() and qcom_scm_get_completion(), which then dereference __scm directly. Thread scm through both functions so the IRQ handler path never touches __scm. Non-atomic SMC calls made during probe (e.g. from qcom_tzmem_init via qcom_scm_shm_bridge_enable) can return WAITQ_SLEEP, causing qcom_scm_wait_for_wq_completion() to run before __scm is published and dereference it. Add platform_set_drvdata(pdev, scm) early in probe and change qcom_scm_wait_for_wq_completion() to take the device pointer and use dev_get_drvdata() to reach scm, removing any dependency on __scm. Fixes: 6bf325992236 ("firmware: qcom: scm: Add wait-queue handling logic") Signed-off-by: Mukesh Ojha --- drivers/firmware/qcom/qcom_scm-smc.c | 2 +- drivers/firmware/qcom/qcom_scm.c | 22 ++++++++++------------ drivers/firmware/qcom/qcom_scm.h | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm-smc.c b/drivers/firmware/qcom/qcom_scm-smc.c index 574930729ddd..7abe60fce676 100644 --- a/drivers/firmware/qcom/qcom_scm-smc.c +++ b/drivers/firmware/qcom/qcom_scm-smc.c @@ -105,7 +105,7 @@ static int __scm_smc_do_quirk_handle_waitq(struct device *dev, struct arm_smccc_ wq_ctx = res->a1; smc_call_ctx = res->a2; - ret = qcom_scm_wait_for_wq_completion(wq_ctx); + ret = qcom_scm_wait_for_wq_completion(dev, wq_ctx); if (ret) return ret; diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 6b601a4b89db..464ae3b4ca43 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -2630,23 +2630,20 @@ static int qcom_scm_get_waitq_irq(struct qcom_scm *scm) return irq_create_fwspec_mapping(&fwspec); } -static struct completion *qcom_scm_get_completion(u32 wq_ctx) +static struct completion *qcom_scm_get_completion(struct qcom_scm *scm, u32 wq_ctx) { - struct completion *wq; - - if (WARN_ON_ONCE(wq_ctx >= __scm->wq_cnt)) + if (WARN_ON_ONCE(wq_ctx >= scm->wq_cnt)) return ERR_PTR(-EINVAL); - wq = &__scm->waitq_comps[wq_ctx]; - - return wq; + return &scm->waitq_comps[wq_ctx]; } -int qcom_scm_wait_for_wq_completion(u32 wq_ctx) +int qcom_scm_wait_for_wq_completion(struct device *dev, u32 wq_ctx) { + struct qcom_scm *scm = dev_get_drvdata(dev); struct completion *wq; - wq = qcom_scm_get_completion(wq_ctx); + wq = qcom_scm_get_completion(scm, wq_ctx); if (IS_ERR(wq)) return PTR_ERR(wq); @@ -2655,11 +2652,11 @@ int qcom_scm_wait_for_wq_completion(u32 wq_ctx) return 0; } -static int qcom_scm_waitq_wakeup(unsigned int wq_ctx) +static int qcom_scm_waitq_wakeup(struct qcom_scm *scm, unsigned int wq_ctx) { struct completion *wq; - wq = qcom_scm_get_completion(wq_ctx); + wq = qcom_scm_get_completion(scm, wq_ctx); if (IS_ERR(wq)) return PTR_ERR(wq); @@ -2686,7 +2683,7 @@ static irqreturn_t qcom_scm_irq_handler(int irq, void *data) goto out; } - ret = qcom_scm_waitq_wakeup(wq_ctx); + ret = qcom_scm_waitq_wakeup(scm, wq_ctx); if (ret) goto out; } while (more_pending); @@ -2746,6 +2743,7 @@ static int qcom_scm_probe(struct platform_device *pdev) return -ENOMEM; scm->dev = &pdev->dev; + platform_set_drvdata(pdev, scm); ret = qcom_scm_find_dload_address(&pdev->dev, &scm->dload_mode_addr); if (ret < 0) return ret; diff --git a/drivers/firmware/qcom/qcom_scm.h b/drivers/firmware/qcom/qcom_scm.h index caab80a73e17..cf90a565fdfb 100644 --- a/drivers/firmware/qcom/qcom_scm.h +++ b/drivers/firmware/qcom/qcom_scm.h @@ -66,7 +66,7 @@ struct qcom_scm_res { u64 result[MAX_QCOM_SCM_RETS]; }; -int qcom_scm_wait_for_wq_completion(u32 wq_ctx); +int qcom_scm_wait_for_wq_completion(struct device *dev, u32 wq_ctx); int scm_get_wq_ctx(u32 *wq_ctx, u32 *flags, u32 *more_pending); #define SCM_SMC_FNID(s, c) ((((s) & 0xFF) << 8) | ((c) & 0xFF)) -- 2.53.0