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 4EB7464AA4 for ; Wed, 15 Jul 2026 03:15:57 +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=1784085358; cv=none; b=KZ6CAO/J/i3WkIYDY40rKER0QVCIpDppP69vP0zjjCFXa693+sZfUJkV/58/wqLwBmvcmaxk5zrvnYqrg+p4XO2RSGy34GqZwMQe63PHSiyoZaaSOpfxm7dRvYMo4CLGFlv0HMAZrYJZrT0j4ES54AvDHYm3Ky6xO7HgTcbL2wI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784085358; c=relaxed/simple; bh=yURs3R/X6zfDVBSe5EB9d9wyeV9Vpx7Z7ayKRaWIoeA=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=C3ovr5FHLvEMkMHO9ZtGQJbuJszWAUcgOFXMF3woOax3kQqB0rHR/9/KIs86l/U9GUc7yjz6+LqMOsKxwJU3/5U6oDbT0PmYBqOy1owwRlomICEwN7CUI4BFes1dsW5sWgOxwJAfp2yCyV2pZ5qxz1CqxtPGrHrSWbg1dQmZwxM= 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=Y97+WZNo; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=TNKi0k3B; 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="Y97+WZNo"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="TNKi0k3B" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66F0IUw62143857 for ; Wed, 15 Jul 2026 03:15:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 59dtjn3uigWcqD04FKFVloeTaBJk83JWYja0Nk1JPpA=; b=Y97+WZNoYirbt+yU Dmgjh2qwKrggfixGQGRCQckh72F2BOR2Vi4k1BOBouCPewvPKol8pC9w4/VRnn0a MW5WCUFtcat8PwimEgRCLW1HstzdZBFPlSO7CsJ/gGGLggpxMGbsw4Q2qxuu0dMs 6SB5QDKI1O4qNscZuEBIXwq7E0X71GlKOia3G7ukIXKyAJI+ZczCVjZO5oh/bogf /L/VTfEKteCs4eMZUnhy/yJVURbGhRWl9mlKv/R4Rp3/K1jNCwlQp0A+dAcrUFys xw7gF5IMk+Bq6qAFsXM/E5UE6S6cXY3uW14zNkDhrZEwI8T68OIz9Az36v8yc8bZ I+5SiA== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fdmjq31kp-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 15 Jul 2026 03:15:56 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-385d2703b64so292370a91.1 for ; Tue, 14 Jul 2026 20:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784085356; x=1784690156; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to:content-type; bh=59dtjn3uigWcqD04FKFVloeTaBJk83JWYja0Nk1JPpA=; b=TNKi0k3BOoa5PjbxIsZMoBFtwyuug4Fz+Nfy1PViCSonRfr3va+F8+454Y8uhmrLw0 4YkLmAjjkAjcEKi0i+8WZtbGQHKsYh8BBeLEzDsLUBTCFYpYUeNK7xslgsq8z9Q4YDBn vrltGYi+oCDNUwG8KBxJ1Z47mk0U0S9sDeYzHJbjmWqTHqS4h8Nd4718eK79b5a7lIl8 8CH53bYw3fD8rBGrdqmu8r3ceLmuxStymVDz1pKsbVL4iKRUYi3Tl/aPygvlOQJIyppi AHzNfoa0yiyUfymEWqmKS7daCO7Cm+L1Lwr0Qg59goKsIYQ379UKDis5pnRp6EGfFpMG T+3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784085356; x=1784690156; h=content-transfer-encoding:content-type:in-reply-to:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=59dtjn3uigWcqD04FKFVloeTaBJk83JWYja0Nk1JPpA=; b=T0rvSpYaWSsg6eVBmOyCCXELnqtoW0IdNKD2px8LokiiONkjGKLhqTL5eJPSIfywgs jAWWXB4xq7BrzHbdN4bny7yWa3gT4hkJ0ldBWPgQuRzm3Y+ik3wrhVkaiLy6PEIpfHST gAPuR6Blx84hO39C7AufgcdK5ZRUl4wq4SkdKgbKUK9Z1pVwvIX107yUwZYqm/dFvFii 7WCuTgC3l5UQkDwLJrtBVo2IbBwe4pBPZasT7bpzB8NLPeGtKtg470LTQXAgmWrJHYc0 7cNOt7JkvztAdVa3wRJo2ToyJFn8qWraTqOy1tpu/j0/0gEMugoLIlrvIPxYwqJjblPc OHcg== X-Forwarded-Encrypted: i=1; AHgh+RqM3dLKqR6BF5a6QnhbX0qr0gRy8WB3JXd7skYi7H0JdV+L1CEX9ucMYxOFx5eW1836UOXkCFqvHDT78PI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9Qdy1tXIZBC23mO84nZDaIzBbhtNb5NSjNcIFoaRq+uiwtwv4 +pU+rGEnRndZcYKQ9APQxUUA4x817Ihb2mNF6gY0BU+4XfNizzrCJe1TSOVVEaGGqmm70H0qYfj /l4FyCkS0nz2ePg0EkHE26IBqU8S/sDhcrpE4NsfnRd7xLjoqaLf64axDk7ZTKSZAtqY= X-Gm-Gg: AfdE7ckoKKT6dgExzyKShrNdrDaNiP3OOPqEsDWiEGcIaSregVjUzNeXMQ8Xfm/gfdt hnWeQqT5yVxzpk/jHrn+pp/Kyqf8XqSKb0VRvqGCVhZ0eqR8c46x2zSipY78hhOo6dud7Aga0nq N2VPZH44OLaku6SHYivFOewnxKJIFxbtOA1uOHelQJZGvXhCU/j+UUo1G32i0eIGQQbAU7X7yBA 5x+9vWJX5JUhp4M0aT4ZpqA5thw+VFG/HnkyStUI7Daz0QKK9x+QKeb5ukJRoYynlH8tPq26Mjf qFo8ZXnbypBGxaR8Z8juodvbz6x9zY/g/iWnnh84puIMmTBrbooN5WJ1ZLxcNVI703KNz17i7oL 2Sky+Gk6rbWqSCffEeGPQbiqxJSHG4SLJof4WmBX8Nq6GBrqibAe7ShxZQCy4ZLpA52B/bnQcpF WsPQ3otQA= X-Received: by 2002:a17:90b:2248:b0:37f:fd70:6790 with SMTP id 98e67ed59e1d1-38dc81c1b09mr11421809a91.9.1784085355777; Tue, 14 Jul 2026 20:15:55 -0700 (PDT) X-Received: by 2002:a17:90b:2248:b0:37f:fd70:6790 with SMTP id 98e67ed59e1d1-38dc81c1b09mr11421788a91.9.1784085355202; Tue, 14 Jul 2026 20:15:55 -0700 (PDT) Received: from [10.133.33.98] (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38e1745a86esm2287488a91.16.2026.07.14.20.15.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Jul 2026 20:15:54 -0700 (PDT) Message-ID: <3c67115f-5aea-402a-987b-c3092e0c3386@oss.qualcomm.com> Date: Wed, 15 Jul 2026 11:15:51 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] wifi: ath11k: fix resource leak on error in ext IRQ setup To: ZhaoJinming , Jeff Johnson Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-kernel@vger.kernel.org References: <20260713105912.20095-1-zhaojinming@uniontech.com> From: Baochen Qiang Content-Language: en-US In-Reply-To: <20260713105912.20095-1-zhaojinming@uniontech.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Authority-Analysis: v=2.4 cv=LqmiDHdc c=1 sm=1 tr=0 ts=6a56fb6c cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=iHwBjlyiAAAA:8 a=EOvvyNets2oEhnj6SMYA:9 a=QEXdDO2ut3YA:10 a=mQ_c8vxmzFEMiUWkPHU9:22 a=uNSKXYNwxGiU6LD0JREI:22 X-Proofpoint-GUID: tIRzcl-108AlwjMgyDOB8JRvlwQyI4Mf X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE1MDAyOCBTYWx0ZWRfXyGeFZFhFk+UB c3L9GxqjWCIHA33GvS6CmpAXEOG6+s9mAxQVMbmyzhxzHjnyvydadFMJlAL6kLzfPHZtRb/s8c5 POzz/XLSC4pjIsBsUBU3IdBoGMt0s6iNVU6ezH9UJv7i/HSZx8RC2YVyCiNa6WD3J7xUYXM2ys0 JykFevOmlQb8gyKPcSRkloTOLzsnVH465nxpsNWSyu57zzK2L7ndTNYjbrJeY+Dicj+S3iTX9vx XEFjMAnnIr7vigVXhmwHupOLqBJRjqsBDvljSq+zvJaMckhkU4bcHXaGEv2mEeq4f+GcAzkavHN H2lzGIZJbkHbO0fZ7JKTUunxZOubGy6ET2+t80YHgnIrNBemkrPvVudcO17whkKJ84Nbix9h/6F JYhgy5u06J8pzwKFefB16OFNWys+DtousUz51dr73twOMKUEE87xD2kGHri6YcxLPK9TY4qxZMc Afbm/AWLz/+geKQQKjg== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE1MDAyOCBTYWx0ZWRfX2ePzcLUxNn4u 7ayxDS6dpbtpgjScX1l0EqMMPfp/mlnRNMOppRW0hWbcH5VSAsvTuhgEoJLQXSOhuer+fpaJRHE IbwbNFRdyTE1R1see8fwTuhKz1+Xf6Y= X-Proofpoint-ORIG-GUID: tIRzcl-108AlwjMgyDOB8JRvlwQyI4Mf 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-15_01,2026-07-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 spamscore=0 bulkscore=0 clxscore=1015 adultscore=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-2607150028 On 7/13/2026 6:59 PM, ZhaoJinming wrote: > In ath11k_ahb_config_irq(), when a CE request_irq() fails, the function > returns the error immediately without freeing the CE IRQs that were > successfully registered in previous loop iterations. The probe error > path does not call ath11k_ahb_free_irq() either, so the previously > registered CE IRQ handlers remain attached to the interrupt lines and > are never released. > > In ath11k_ahb_config_ext_irq(), when an external request_irq() fails, > the error is only logged and the loop continues. The function then > returns 0 indicating success, leaving the device in a partially > configured state where some external IRQs are not registered. This > causes enable_irq()/disable_irq()/free_irq() to be called on > unregistered IRQs during runtime and remove/shutdown, triggering > WARN_ON(!desc->action), and missing interrupt handlers lead to data > loss. > > Additionally, if alloc_netdev_dummy() fails for a later IRQ group, the > function returns -ENOMEM without freeing the ext IRQs and napi_ndev > that were successfully set up for earlier groups. > > Fix all three issues: propagate the error up to the caller and unwind > all successfully registered IRQs and allocated resources on failure. > > Signed-off-by: ZhaoJinming > --- > > Changes in v2: > - Move `irq_grp` declaration from for-loop body to function scope to fix > compile error in err_request_irq error path. > - Set ret = -ENOMEM before goto err_request_irq on alloc_netdev_dummy() > failure to avoid returning uninitialized value. > - When ath11k_ahb_config_ext_irq() fails, unwind the already-registered > CE IRQs via a shared err_ce_irq cleanup path to avoid leaking them. > > drivers/net/wireless/ath/ath11k/ahb.c | 48 ++++++++++++++++++++++++++-- > 1 file changed, 44 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c > index f566d699d074..11bafbd94aff 100644 > --- a/drivers/net/wireless/ath/ath11k/ahb.c > +++ b/drivers/net/wireless/ath/ath11k/ahb.c > @@ -524,20 +524,24 @@ static irqreturn_t ath11k_ahb_ext_interrupt_handler(int irq, void *arg) > static int ath11k_ahb_config_ext_irq(struct ath11k_base *ab) > { > struct ath11k_hw_params *hw = &ab->hw_params; > + struct ath11k_ext_irq_grp *irq_grp; > int i, j; > int irq; > int ret; > > for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) { > - struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; > + irq_grp = &ab->ext_irq_grp[i]; > u32 num_irq = 0; declaration after statement. better to have num_irq declaration at the beginning of the for loop. > > irq_grp->ab = ab; > irq_grp->grp_id = i; > > irq_grp->napi_ndev = alloc_netdev_dummy(0); > - if (!irq_grp->napi_ndev) > - return -ENOMEM; > + if (!irq_grp->napi_ndev) { > + ret = -ENOMEM; > + irq_grp->num_irq = 0; the ath12k_base is allocated by kzalloc, so the ext_irq_grp array, as a member of ath12k_base, is already zero'ed, hence this re-initialization is redundant. But I am OK with it since it improves code readability. > + goto err_request_irq; > + } > > netif_napi_add(irq_grp->napi_ndev, &irq_grp->napi, > ath11k_ahb_ext_grp_napi_poll); > @@ -600,11 +604,25 @@ static int ath11k_ahb_config_ext_irq(struct ath11k_base *ab) > if (ret) { > ath11k_err(ab, "failed request_irq for %d\n", > irq); > + irq_grp->num_irq = j; with this forcing to the number of successful irq request ... > + goto err_request_irq; > } > } > } > > return 0; > + > +err_request_irq: > + for ( ; i >= 0; i--) { then with the index starting from the failed loop ... > + irq_grp = &ab->ext_irq_grp[i]; > + for (j = irq_grp->num_irq - 1; j >= 0; j--) > + free_irq(ab->irq_num[irq_grp->irqs[j]], irq_grp); > + if (irq_grp->napi_ndev) { and with the guard ... > + netif_napi_del(&irq_grp->napi); > + free_netdev(irq_grp->napi_ndev); > + } > + } at the cost of above three, the centralized err handling is working. Yeah this simplifies the code, but makes it hard to understand. what about: 1. refactor the existing ath11k_ahb_free_ext_irq(): ath11k_ahb_free_ext_irq_grp() { for (j = 0; j < irq_grp->num_irq; j++) free_irq(ab->irq_num[irq_grp->irqs[j]], irq_grp); netif_napi_del(&irq_grp->napi); free_netdev(irq_grp->napi_ndev); } then we can have ath11k_ahb_free_ext_irq() { for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) ath11k_ahb_free_ext_irq_grp(irq_grp) } and the complete err handling of ext irq can be ath11k_ahb_config_ext_irq() { for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) { irq_grp->napi_ndev = alloc_netdev_dummy(0); if (!irq_grp->napi_ndev) { ret = -ENOMEM; irq_grp->num_irq = 0; goto err_request_irq; } ... for (j = 0; j < num_irq; j++) { ret = request_irq(); if (ret) { irq_grp->num_irq = j; ath11k_ahb_free_ext_irq_grp(irq_grp); goto err_request_irq; } } irq_grp->num_irq = num_irq; } err_request_irq: for ( i--; i >= 0; i--) { irq_grp = &ab->ext_irq_grp[i]; ath11k_ahb_free_ext_irq_grp(irq_grp); } return ret; } > + return ret; > } > > static int ath11k_ahb_config_irq(struct ath11k_base *ab) > @@ -629,15 +647,30 @@ static int ath11k_ahb_config_irq(struct ath11k_base *ab) > ret = request_irq(irq, ath11k_ahb_ce_interrupt_handler, > IRQF_TRIGGER_RISING, irq_name[irq_idx], > ce_pipe); > - if (ret) > - return ret; > + if (ret) { > + ath11k_err(ab, "failed request_irq for %d\n", irq); > + goto err_ce_irq; > + } > > ab->irq_num[irq_idx] = irq; > } > > /* Configure external interrupts */ > ret = ath11k_ahb_config_ext_irq(ab); > + if (ret) { > + ath11k_err(ab, "failed to configure ext irq: %d\n", ret); > + goto err_ce_irq; > + } > + > + return 0; > > +err_ce_irq: > + for (i--; i >= 0; i--) { > + if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) > + continue; > + free_irq(ab->irq_num[ATH11K_IRQ_CE0_OFFSET + i], > + &ab->ce.ce_pipe[i]); > + } this is also a duplication of the CE part of ath11k_ahb_free_irq(), consider refactoring the exsiting helper and reuse it. > return ret; > } >