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 836773090F4 for ; Sat, 25 Jul 2026 02:13:23 +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=1784945604; cv=none; b=DNOXNrC4SlFq+bcveAkFyv7nru0mtg3HmH++/LqEXmZJSq0sHP8lmNMrVeicuwwbcmXmdwi769zciJIFTTft84hNsmnuSz6d5m/PauDg3IlxYt/nAKXaWU7rUPdnjGSMxISe5vIqvD0I4NB2jtFiRmeW/Zr3hF4E3Xd9cBuB8Gg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784945604; c=relaxed/simple; bh=gqFhHONCY835sFD+IlJg8lm7TPRM1xtPR+yr1UzAvdw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=FfXXJfJ8mCSUICrNmbaACKWaD+tqBMl1u5+rGRrA83/5TUMFB4isj7Y5ng47oFmmlz5Mz+wQL0qOm3U+7MdlY3YWU84vZNkWDWV1tO5JpGzQpG/hCgENakSu4KosY0iNB7jKIwa4ytw52i9NSPxMp4K2YvJ/WexlGRri8Vw0BSQ= 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=gD5LoPJB; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Hy6lFsbz; 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="gD5LoPJB"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Hy6lFsbz" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66P0qIid376701 for ; Sat, 25 Jul 2026 02:13:22 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= jE1kcn50NdHtg9rHOHQYVIhR5o62mSnqkk6OEOynRdQ=; b=gD5LoPJBajjzddWH O/x61VH99kfrYFCQTu30i1qZOxuri0ck4+BFAJwGiMFV2eHtygUdMcYLPiZfwyVi yEHqU4gbahDfU7Wgklffan9oOlPu8CxsrVC4a1cC+3S/QFy9kkLmb+BcZeD2aaGg Xd5kMKfY3CXmqIf3mamAQ/huDroEWHLzc31lhQvJ8LEoEIae3AdQuH8tXkrrqSaz J+pV6r84QayfR3mV4QL08RSW3TALz6QSYi3dMoeJhz6ioq4xAvn1BHMYSs7Fn0K2 HvB0PGJwnxFWIbOJsNFBw5aI/8GQjBHy7vFT13IGMDvJRfIGM0RMle53t6jlF9EU G8GsKg== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fm8cgjkys-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 25 Jul 2026 02:13:22 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-38e7b87ce77so2270969a91.0 for ; Fri, 24 Jul 2026 19:13:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784945602; x=1785550402; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=jE1kcn50NdHtg9rHOHQYVIhR5o62mSnqkk6OEOynRdQ=; b=Hy6lFsbzthckX5ZKA0cVaLSHyuoAqVG4QloTS+5h+O0I1w/tiJgPnDzGrVt+5pX/pV iEnP1SifgS14FkCL3fqcuqeJlcxaezYS+a7AMeW3UWPcVcg3+yi8sr2XQgA7mkXbJqwx Aw6sznG/IFs0fD6JNmVeA0mGg5ZIN2AIrikwZLOsZx7yNIlZmObBSM/xJy957vB5R/wJ UXq1sMMgMZjjzeegTZ+ETaRU4adpYaMRw2DbPyXOHAUcsCsjo7G64iTRBjU57FKTwL/h kFiyCkgKz1yN6lmNpGUByVz/Ne79y2obp3FtKyb4n1ziMJ6vVTymlThqHM4bIjK80TNV NhEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784945602; x=1785550402; h=content-transfer-encoding:content-type:in-reply-to:from :content-language: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=jE1kcn50NdHtg9rHOHQYVIhR5o62mSnqkk6OEOynRdQ=; b=MCfKZDbJtZYCfoNBdpTt0BuyNBlrzpFQMsCHJZn3VWYQnFIBMDsIi4XXTpvSuMLmxO PCDL9TtPRE4sLUxaLRt5LouPN/Y+Ziaoqp90CK3b9u2c5hY9RN/k6771y+jKwfkggWM/ lWOKz3K5ujz5dls1OEyK4JCGOuqfrTZbt9hI2o90hdPZijdpDpbzfSmkzSOm3H4dV2tK mU6BNyhY4cVpZ+w0c0g2ZW26DWtMFDhnNIxqYMkHXYNC+mGS50QCw48FR+pKMdKzFYWP NkKARe8aVd/qc6Ckiyj89lmDZF/Oc/gMh7Sd8vP9cgRiLWL0vgqpRxfuWPY9uqPKO/Hu GOvg== X-Forwarded-Encrypted: i=1; AHgh+Rr8IAAvOOzuMLe/JBUubn6ZoVC9zFdAvU+tOryGb4UZ0DrPpRBaMrQY3hR6LN7xHcQv+4dvIQOW8dHgqEE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw0sdu5yCllMHTnAk8FYj1Or8pcEN406zCRyg2Fk7vWSxCnE8Q+ Ri7EpVTRv2YpYbyT09apVN5ExcTAEqCiDsDu5jYUaQrq5IfgLC5RA+7ESKuvJPfSYucaeE/c/tJ FIe/3E4vwOGoMeM7KLg9jqOPvzKiXJHh5JX8rd9RmOsMDBrc1amC9uExtyBX5Ax5ksGM= X-Gm-Gg: AR+sD102j7DLACFjxtXzGVTPbZ///K1CI6pwMPd3PT21O0s41c/WRQvHQWD2k0bC3Lh gxW+gjINV3POMeZXGmzgKzre4eUSn5fz0b6dkJAXCs+0522fcJaREodQBJUZ49jjvJmtQfxaCBW mQHX7yqdMCibJ2GyFqWLMGvqkvcE91KamjbhwVpmnYCP5iR0yCN7DMjGxwr/dKT0vjrA3GP+dq0 +DcHXWsFDNNChaq2lO9X64M9OUPl3oN+kzWR3Ax1prZWk71f/vZKdXywbaDJgB9u6BOAZs5wdg1 HyPKqwcA+ygn2sdgzenpXgttn7ss8dwa/eKUPhhPtd8iS+PfCewfZn0c9HEjLi0sb7EthPkcDKS vMFKWbxaDPmofq5+puAsEOZAeJ6wzA4t2Kn1ihlwQ3shfIsNAiH4eEruAsg== X-Received: by 2002:a17:90b:584f:b0:38e:79f:76c6 with SMTP id 98e67ed59e1d1-38f29641ae1mr751210a91.24.1784945602015; Fri, 24 Jul 2026 19:13:22 -0700 (PDT) X-Received: by 2002:a17:90b:584f:b0:38e:79f:76c6 with SMTP id 98e67ed59e1d1-38f29641ae1mr751195a91.24.1784945601609; Fri, 24 Jul 2026 19:13:21 -0700 (PDT) Received: from [192.168.1.11] (15.sub-75-218-246.myvzw.com. [75.218.246.15]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13d130262d2sm27398246c88.7.2026.07.24.19.13.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Jul 2026 19:13:20 -0700 (PDT) Message-ID: Date: Fri, 24 Jul 2026 19:13:19 -0700 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 v5] wifi: ath11k: fix resource leak on error in ext IRQ setup To: ZhaoJinming , Baochen Qiang , Jeff Johnson Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-kernel@vger.kernel.org References: <20260723013818.393470-1-zhaojinming@uniontech.com> Content-Language: en-US From: Jeff Johnson In-Reply-To: <20260723013818.393470-1-zhaojinming@uniontech.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI1MDAxOCBTYWx0ZWRfX5T2TFtgo3HDi S0yva93/7NpkzisPKA6Svnp8GUPpdQH/4lrrXI8L+ULtLaDQpAPVCN9MlL4Ri+2TLM/wHvU+z5O wE6wtHvS/cZlK3sE6biDhMgxnh9O1GJH3JM3P01PP6KJdmUmUZNoJ3lFgwj5B82klrrYmscOFzL Wzt7adH06kACUIxFwI8RkrIPxNSBGxA1XsurTiXPL4J28e3xlWSHJFNbFgJ2X1NzwShAHm++sF4 tFXZOf+gkAcauJ/IMbyvp6HPP7Z6qprLoMjhjADjnA34Oj9lBEK3my9WzCqEVomZlvoc4Gth7XY QZb49Z7hzCeOzbo++uGBoPHpGm2mVFWdaGMe6Y979zia9LFvUQ1100tg2tvDzGLI5ctEDKD3Lq2 joH9pKn11C/YcHL7hWBfWHvH841hCk8Bj9Xtk1mqunF97Et+lqRbascg11WEzF8WN7IuyKN9duS Eh06CMDl5f0qMa3MYcQ== X-Proofpoint-GUID: dvTVi46_CH3n2xGQJMRRfnERMePvyJsc X-Proofpoint-ORIG-GUID: dvTVi46_CH3n2xGQJMRRfnERMePvyJsc X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI1MDAxOCBTYWx0ZWRfX4/Fs+o3yk2JA I/pu5vu1tfO/bNW5CmKACUk49CnoqkkvXlWoXCDCfDSGmVzoi5E0mac10nDpl8vKzK3FJumerVN rCvkCt2feFFVUy8hBPc3ah9M5HNmp+Y= X-Authority-Analysis: v=2.4 cv=P9sKQCAu c=1 sm=1 tr=0 ts=6a641bc2 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=6VQYfvmiyQ8t40WkS/mQdw==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=puE-CX9gChH9hliuQHEA:9 a=QEXdDO2ut3YA:10 a=uKXjsCUrEbL0IQVhDsJ9:22 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-25_01,2026-07-24_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 priorityscore=1501 phishscore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 impostorscore=0 malwarescore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607250018 On 7/22/2026 6:38 PM, ZhaoJinming wrote: > @@ -585,9 +598,7 @@ static int ath11k_ahb_config_ext_irq(struct ath11k_base *ab) > } > } > } > - irq_grp->num_irq = num_irq; > - > - for (j = 0; j < irq_grp->num_irq; j++) { > + for (j = 0; j < num_irq; j++) { > int irq_idx = irq_grp->irqs[j]; > > irq = platform_get_irq_byname(ab->pdev, > @@ -600,11 +611,23 @@ static int ath11k_ahb_config_ext_irq(struct ath11k_base *ab) my review agent noted in inconsistency between this logic and the CE IRQ logic just above here, after the platform_get_irq_byname() in the prior chunk, is the assignment: ab->irq_num[irq_idx] = irq; that assignment takes place before the request_irq() function is called and error checked in the CE IRQ logic (see below) the assignment doesn't take place until after the request_irq() function is called and error checked. so consider relocating that assignment to after the if block below > if (ret) { > ath11k_err(ab, "failed request_irq for %d\n", > irq); > + irq_grp->num_irq = j; > + ath11k_ahb_free_ext_irq_grp(ab, irq_grp); > + goto err_request_irq; > } so assign here? > } > + > + irq_grp->num_irq = num_irq; > } > > return 0; > + > +err_request_irq: > + for (i--; i >= 0; i--) { > + irq_grp = &ab->ext_irq_grp[i]; > + ath11k_ahb_free_ext_irq_grp(ab, irq_grp); > + } > + return ret; > } > > static int ath11k_ahb_config_irq(struct ath11k_base *ab) > @@ -629,16 +652,24 @@ 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) > + if (ret) { > + ath11k_err(ab, "failed request_irq for %d\n", irq); > + ath11k_ahb_free_ce_irqs(ab, i); > return ret; > + } > > ab->irq_num[irq_idx] = irq; note here the assignment takes place only when request_irq() is successful > } > > /* Configure external interrupts */ > ret = ath11k_ahb_config_ext_irq(ab); > + if (ret) { > + ath11k_err(ab, "failed to configure ext irq: %d\n", ret); > + ath11k_ahb_free_ce_irqs(ab, ab->hw_params.ce_count); > + return ret; > + } > > - return ret; > + return 0; > } > > static int ath11k_ahb_map_service_to_pipe(struct ath11k_base *ab, u16 service_id,