From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 386843590A9 for ; Thu, 30 Jul 2026 03:10:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381035; cv=none; b=XFSJOPODOUU9VyHfI/8+lEOvjBgVsNyO+Cv0+N29lmlRhh4ugKMehTrfDZbYpEwuZNAJ7XZVW0RwakYa1hIXJUpj/oZA8o9e8JxC62YS1ijHxero0zSgjrdZQPLw64thVFWne3yZq9YXoDQ278ssXjwUBnGb4bop7xIYjgIKHaQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381035; c=relaxed/simple; bh=aEGf7PIuBZ+MHW/eqEqoQXnJ2uzCpXMwo/25tnWSSRM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bCQh+KZqEYAPCg0iSXFXsq/L275ddVNyPSQAmQmuNWuJ9RvQUt+38Lr79cx6elBeaYMFTSUX6kd5xLZK7Ogqlyik97kIWL1bZl2hC5TnaYYaWN0dPYeDiiLi+zr6KWEpGwUNdKJqo9+R7ENfIMxcvWTCHcnMFVJb0S6QFdJi0no= 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=QpFLYYSS; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=V48qyDDQ; arc=none smtp.client-ip=205.220.180.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="QpFLYYSS"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="V48qyDDQ" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66U2cFrh3927969 for ; Thu, 30 Jul 2026 03:10:33 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=ZYFFatroACJ PZgrWGjCltvltJd9wtFIF3w6l6ozfvvM=; b=QpFLYYSSZNMpQiFouLUf7ZcAk/B FyZdTeRvEEFToQoOiczCsE1wVuo3B1fTaEIOWoI6QWm3M1D22kjYnLz/r8NJ2eqF dAUkUw19e1sb3iGgmleSFq82xp0xUXuuQdeJC/JSZY5CfzyipwSyUkwmQz52OZRE H6as6scN0vk9NR1QSzeMesrFIKP9hQDiJrwvjMM6gT1QHC/UvaZhPAehqQXjCg23 vBkMPzlhsduUdJFe0O4si6bPzkA5UKT4MbsqXtYxsBlDU7tQpSb11qzYGcXivWC5 Kpvu2v2y9zFgDIOpOxG7knr5nycAQKhd4B78f+XmuIfvGL3GohHQivaKvdg== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fqx0m83wn-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 30 Jul 2026 03:10:33 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2cc86a9ef97so33706085ad.3 for ; Wed, 29 Jul 2026 20:10:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785381032; x=1785985832; 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=ZYFFatroACJPZgrWGjCltvltJd9wtFIF3w6l6ozfvvM=; b=V48qyDDQQMKL+QiTNL8RcdVQd2KTnQVvhNuc/Ju5HhVlueOg3aMc9FRg/ZcatYt24R iHPb9LJeK1Ed+m6z/oSIFaJjn+AUw70Cj9xBBZJLcxIYJ9IQEm1BSBDLdMg+OXwkMAHX qvxHhfdaKr+nhrDx8IUO2wInzn5wTa11b372zTfLj5cabWTIJq9eCzpONCLi4KEkJ7mF Pm76+SzjvPZJn8fRslrIqx/9sXVdRVDx+74oZ7leapnLzP27ANGyNwe9Gm0dYmGKDqaf rIrLGZiK1xVw6u26ygePPtTUPW0Ec/dNwo4QgWbAzjfPAYWfvTFThwtsvF6ai3qBzXNy hy2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785381032; x=1785985832; 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=ZYFFatroACJPZgrWGjCltvltJd9wtFIF3w6l6ozfvvM=; b=gELFk5TtMDJTL03MzuKiR0bP1KHeMFU+1nJmgeguY+ca9UZTdW3kLvD0zdMJuQVrFf tc7H7VL+Y8XTOhzEOwNJRxeHuY0xH08CUlb3AwvPNcyfOHYVIWPfCrvh6G/kH1wOL98u F491Zj9EpnpoHFNNjVzFN9u/sm1HxmzOydGm3vUlzDmJuDrD6EQDEU3V+da4JfOOsdSu agLHUKNQxu+py6T35ZeM6p1g4LwrGjcTZK8L5cdqHRdhLDveEVjISZhljwpdaQe92nVr Q46U0aiDBBV5M4+llzGpnQQZNQQbMhQDNtb92T7vSMaU9uiB8uSFZKzGhMDdKd7ia8/w x3oQ== X-Forwarded-Encrypted: i=1; AHgh+RpNFNZnFnJSPAJYgooErNrysn+AodvsaF2bwLJddIY8J03Jv1Bv7bHlad9xsLgfEF+RVAKlxqXyW18ebBU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywq0XUs2wZLthK2pf4QaS1WmRs8mSaae+PK5naCr8TE3cvdwX2q NAkHzpzAnjyg9tffQQZDI+YEzBuKAtfldpYKiSIXpIzo4Ob04cccFRR0zDcRXaZp8SzutMOqt+H 6t9siRGVOc+77ozUCoM4fdLP7nnIAHVNLZYEibEfWX7pf1qv3AAuuYbgWG5rbZMUOXxE= X-Gm-Gg: AR+sD13R535eNZ6hL9PihWddDcyjWc0yzfKMp/t2TOQ87Haf5f23iFyDusRsn0N4d8l AQgZ11bMZwrkM9myvFniGZujP+IbjSU3xkSJfqmrVUdi+RtOz+XfbkV5DCeGt+jCYXUGwVz+/TX yAoqL9lT0w7vsQ/8HqlgCWRzeWHvu0Vdl8+shTRqleLZMmw39VNGYrbEoXGFOvg8OtGszVEXLag AkmtqiUStG0lX7hw5inzp/6nh3hMj12LZb/2Yo9mwf09LSx76JR4FhRU2AgCzC+DDudlsEcbHxA S5tVOVmTvnF1T9AcKRmjxr2kdFNi4RJEdyqgvEou0PDzeiCjf6PDRG85x7kWNSk+oEiap2LuR4u H8G2fSgGj1BVidIZGB42oiRf+LZF+XIJ6MtHF+4e4Y8CX8eBOvvd5a/EMc0U= X-Received: by 2002:a17:902:c404:b0:2bd:8395:fedd with SMTP id d9443c01a7336-2d035cd9f0emr8998235ad.37.1785381032153; Wed, 29 Jul 2026 20:10:32 -0700 (PDT) X-Received: by 2002:a17:902:c404:b0:2bd:8395:fedd with SMTP id d9443c01a7336-2d035cd9f0emr8998015ad.37.1785381031701; Wed, 29 Jul 2026 20:10:31 -0700 (PDT) Received: from Z2-SFF-G9-MQ.ap.qualcomm.com (i-global052.qualcomm.com. [199.106.103.52]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d022c2e5b2sm18928035ad.74.2026.07.29.20.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 20:10:31 -0700 (PDT) From: Miaoqing Pan To: jjohnson@kernel.org Cc: ath11k@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Miaoqing Pan Subject: [RESEND PATCH ath-current 2/3] wifi: ath11k: fix NULL dereference in ahb remove when QMI init incomplete Date: Thu, 30 Jul 2026 11:09:47 +0800 Message-Id: <20260730030948.147892-3-miaoqing.pan@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260730030948.147892-1-miaoqing.pan@oss.qualcomm.com> References: <20260730030948.147892-1-miaoqing.pan@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-Authority-Analysis: v=2.4 cv=GdUnWwXL c=1 sm=1 tr=0 ts=6a6ac0a9 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=b9+bayejhc3NMeqCNyeLQQ==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=1dbm4JsyFlBaYKuhsR8A:9 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-GUID: iuGeDn4ZzthNr1rDc4lu5hN0iHQArAOm X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMwMDAxOCBTYWx0ZWRfX1RaBhmDCpnFz GwfASFLQgxlQCggGIVaLEJAFICLvh5KXst9KIvr143C72FqZyq1snu8KX/rpen0vlj2tXsIB0br mPYgoCdNMYPaS9u3WO+eGiY7ifnCeWk4xdDHLBF997qZN6LYC5EQc2JY8tSSxEdo+TpetFCQq7Q WdcqjIjARZRcsD93zGT1gkCNOGM0p9RmhvU8nBVl1eCyrKmr7W0jgDebTa0i8Qv0i90E0N7ZHhO qfu6UKcU3HsSQuA9V9YWKHkx5daHpK+PLE+effnIDanpFcJ2TdzHCqrbYsukT1qeWibazXDZiEk cJ9zaYpt5MetARp3wJ9BT5d+LCg8ufCX+t4kmmrPNknPjZEKVWyzVaq1BYNdVc29aGZVNlsVyRM 8Zlanjd17STaKLIPvR7bwgL4AFisZSFMP2u2pblBsSHJQiO8iTf1+OVN+rpWV6jj2wTpUpcuRsi e1AQKM7jIkTYstOP0TA== X-Proofpoint-ORIG-GUID: iuGeDn4ZzthNr1rDc4lu5hN0iHQArAOm X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMwMDAxOCBTYWx0ZWRfXz7O00Dt41iDg EnZ6ILmKn5lIGpNb65tKmcqUzEnf9foy/q6Em6rsExZexcHou/6/Fn7lUBf3Gkim7YphPJE0VCb bBcAPsfaMJ305PhtYPh0MQ1nHowLxQo= 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-29_09,2026-07-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 suspectscore=0 adultscore=0 clxscore=1015 malwarescore=0 impostorscore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607300018 On WCN6750, if QMI messages never arrive (for example when qrtr_smd is not ready), WLAN initialization stops before the device is fully registered. In this case ATH11K_FLAG_QMI_FAIL is not set because no QMI event handler is executed. When the driver is removed, ath11k_ahb_remove() still calls ath11k_core_deinit(), which eventually triggers ath11k_ce_cleanup_pipes() on uninitialized CE pipes and results in a NULL pointer dereference in ath11k_hal_srng_access_begin(): ath11k_hal_srng_access_begin+0x14/0x68 [ath11k] ath11k_ce_cleanup_pipes+0x184/0x190 [ath11k] ath11k_pcic_stop+0x24/0x38 [ath11k] ath11k_core_deinit+0xfc/0x1c0 [ath11k] ath11k_ahb_remove+0x38/0xa0 [ath11k_ahb] Fix this by invoking ath11k_ahb_remove_prepare() before the state check and skipping ath11k_core_deinit() when either QMI initialization failed or the device was never registered. If ATH11K_FLAG_REGISTERED is not set, core initialization did not complete and CE pipes may remain uninitialized, making ath11k_core_deinit() unsafe. Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.2.0.c2-00204-QCAMSLSWPLZ-1 Fixes: 00402f49d26f ("ath11k: Add support for WCN6750 device") Signed-off-by: Miaoqing Pan --- drivers/net/wireless/ath/ath11k/ahb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c index fb5640882b98..7f5f5c8d7c56 100644 --- a/drivers/net/wireless/ath/ath11k/ahb.c +++ b/drivers/net/wireless/ath/ath11k/ahb.c @@ -1265,14 +1265,16 @@ static void ath11k_ahb_remove(struct platform_device *pdev) { struct ath11k_base *ab = platform_get_drvdata(pdev); - if (test_bit(ATH11K_FLAG_QMI_FAIL, &ab->dev_flags)) { + ath11k_ahb_remove_prepare(ab); + + if (test_bit(ATH11K_FLAG_QMI_FAIL, &ab->dev_flags) || + !test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags)) { ath11k_ahb_power_down(ab, false); ath11k_debugfs_soc_destroy(ab); ath11k_qmi_deinit_service(ab); goto qmi_fail; } - ath11k_ahb_remove_prepare(ab); ath11k_core_deinit(ab); qmi_fail: -- 2.34.1