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 596D9318B91 for ; Wed, 28 Jan 2026 16:30:27 +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=1769617829; cv=none; b=UY64BPGSGLvPb2VWpba24fD6jhAZEfUMQJ/uNvpMPA7x3mlSOTpSQ3X2iOWXh9Ld1tOuZnmFl/QvgDra5wsbWTunD+S41tguXm1goXKw4PH4bS2Hmm40a7sCsoLJkc4LKP3F91jsLFCEtHEf7qB4gN1TbXUgkcm/n+Xr07q2bzI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769617829; c=relaxed/simple; bh=aDgIxXjpQ1KOxUnNki1fM2T6kdAIXo8L5rJv4hAWvdU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=pMSNAHArfh9ZS0boqnGKwuYLuR3h33USBf8DE3zTdAbylns+2hyuGn6IyS3FFpVQ8Uvj2N8+R6YEErs/+Pq45BL1wg3jfF1eFj6oardnIlj8NlFRSiVlWSxwkHxxAdZyF3j4aWhAX1AEsb0EbXwlDPYCN4okLQ55Y8cTg6kgTJU= 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=XDBjR8j8; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=PQC+vj+I; 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="XDBjR8j8"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="PQC+vj+I" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60SFWifR320337 for ; Wed, 28 Jan 2026 16:30:26 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= PQGe/X5qhgopdlhTGL3zNTsLAfHq3ot7gtt/3+73Mrc=; b=XDBjR8j8O2/EAtsV zWHfkUKTP1xIMVN4fWe5kedH/SuE+uLE+3mYAEsBOKCIKZmW4zbLK0jBJfLZd/qH /bcMs57pL38DCodeaBQrxXyBSq4M2OTgh90nlzZYkDknq7LfbbaChPCUv87ysTRM 6THPM8zBi/CH6f9aVdcZOdHZ551dNElGKT+GdBrrxuiqRAv/ZhlVQ8cn+BBGN2BH Fd34EfAgaHPjmhmwBK3buM140M7Z8mDOK8dmopKei/vDGOgm2Xv9woJ5h9Z3IRdD 9gcH61Nr2iRKkRWtDHOJLfpgSvM5yDRUy2dC67tXmvIDw9sTJ3chAwMyNO3H/d/I v1qd6Q== Received: from mail-dy1-f198.google.com (mail-dy1-f198.google.com [74.125.82.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4by4sjun6h-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 28 Jan 2026 16:30:26 +0000 (GMT) Received: by mail-dy1-f198.google.com with SMTP id 5a478bee46e88-2b70d8095daso24805eec.1 for ; Wed, 28 Jan 2026 08:30:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1769617825; x=1770222625; darn=vger.kernel.org; h=content-transfer-encoding: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; bh=PQGe/X5qhgopdlhTGL3zNTsLAfHq3ot7gtt/3+73Mrc=; b=PQC+vj+I5tOVhq2S7F3qZ3HLg64RpEdqLBnZ0/0soKdP1J0rNet4fVQWI6CEG98sio HnQD/njO/f4MIDhr4tJMifnhGAJUr4U5dDsC1UH5TzGbBrIKLpKpliQ2FLl8dR6iptdf fdVZt0As7C1HctIf/kRbdN72HL3yNMuGR3DvYoImHVIj/NNpYIHc9+ll3IFd2oqW8XQF hYAYdDeAt0xdFSm7kNEvX+8TxvqQEmh4SIGrC7UrQ9rcO3Dj8cdSEZSGikQ53w6PZ4L1 SkVOvNyNW761WkNaBju54RIQcZV/ol6DTO3lL+Q6m2QShw9QIMwM8l1mdyvGrjD+9NP2 3Tvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769617825; x=1770222625; h=content-transfer-encoding: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; bh=PQGe/X5qhgopdlhTGL3zNTsLAfHq3ot7gtt/3+73Mrc=; b=G6CJKh7P3/REmuMmmqWuFqBk5mDZH9mX6iUy9gPamoAr+oGEhld981mW3U+4nPqWhZ oq7PS/d5WX+9D85CZxwlrCCBJEgM9BqixFwHvDkVyVXlZgDhHGH/65racgBAJrbg2LyV 8XTnIcimEalaRTQ+CwQDncbpfewg9nWyFSIjakjOahZWnGzbpU0w2o4sORGKw05NPCzY vtFw+qoosLyJ48eKINUs75l35rl8ch3Us/wLn18hmrCbujXXZzzuNCMqtDE1DPQW2A2g fkN1+ixZW2Aj3Lder5qxCyLqgnV+1fSPntCZPlQrP4dFPJlGo1zYxgg6HN9UqIKbm+Mb t5yw== X-Forwarded-Encrypted: i=1; AJvYcCUDpvxJMxWAHCql6s5fXlNQvg1FpNiOFz9UNSVjatzeTddC35x+L5rshunyxyyb8MVDo3r8ultlzIjwMkc=@vger.kernel.org X-Gm-Message-State: AOJu0YxRD6ax606ohD92o78/9fZw4aeaA8bNtsJfI9QzM0p4f4eWaUvf ZrY3uEWqEYHRYL54a6kkZ0pFD2A4gXxSQe+fETRB87Hubhh3LxblN+CBVVB6b3l79p6J1EwTmbT i1psNF3AHI1a1MOX52feNVMKJL5vhHHyxFfYXZHOVF9XWCgBbt/HNOVpwRClKW5LcWbY= X-Gm-Gg: AZuq6aI1nACXlqJ31V4BdQ8CLdehqTP1HQGXEX9tlSxENIvUjK7Oxr+cF2grjslKQeH 4190GjP5Zx/OAbz/LOUDrwBKrW2CnH0x78dv8pa5cdE6DjjGUFxDj9z38IyvocyOJYE0N0PicJl ypKC3kU6YtQgz2E3yGz1J4j2Wa+8+W7scooRvS0m/MMxUdEQdq0NKi6CujZGSKeZvKMDjVwWSuk 1xkebP71+gF8PcTLEvepLs6s4ojV05NdK9QRxaPMQog9Lkpff+vz2KTVi/0XWqtzv545Uz1qmfz zO17ZW3R3b9rB/cpoeHVqscLcZqDGpblDUeMjZdRILisZCYw9ZHB5pfOSIJRgDbu6CGcAZAEALH 4WRpHky6DzzRPi9Glx193TSKwjgtQHhXyaPU0iFsxeUjU0dUNY/yQ4UekhZPMB16dOOUqIQ== X-Received: by 2002:a05:7301:688c:b0:2b7:24ad:5c54 with SMTP id 5a478bee46e88-2b78d8d4028mr4295838eec.9.1769617825085; Wed, 28 Jan 2026 08:30:25 -0800 (PST) X-Received: by 2002:a05:7301:688c:b0:2b7:24ad:5c54 with SMTP id 5a478bee46e88-2b78d8d4028mr4295818eec.9.1769617824506; Wed, 28 Jan 2026 08:30:24 -0800 (PST) Received: from [10.227.110.203] (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b7a1af88dasm3548084eec.32.2026.01.28.08.30.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 28 Jan 2026 08:30:24 -0800 (PST) Message-ID: <6cc72c12-6f50-4e91-9b7a-bde8633009c4@oss.qualcomm.com> Date: Wed, 28 Jan 2026 08:30:22 -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 memory leaks in beacon template setup To: Zilin Guan , jjohnson@kernel.org Cc: baochen.qiang@oss.qualcomm.com, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-kernel@vger.kernel.org, jianhao.xu@seu.edu.cn References: <20260120063731.2383695-1-zilin@seu.edu.cn> From: Jeff Johnson Content-Language: en-US In-Reply-To: <20260120063731.2383695-1-zilin@seu.edu.cn> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI4MDEzNiBTYWx0ZWRfX69tM6EO23RtD cOshQCIbdOSuitcRTbtCZTNEENDApJp3QFpUxTh/qeEeeKDsgCq92yrB20JYvAOWGH5TsEmmZsr Dqs/fkpMAvkcAUDKputzCKbyoZc/HtnAt79SCHCk2mr/ZkSGQ2uSg5AmNIYVJ7BrkYfl+2mhhUc fA5T/ObxiPDcGqpvMFUQaGqGd85wfnoR6gzg2Ree7kcWE1tUw+bfDaQQMDps8kkmsi+r3rB2lNb g3VaeBaO6d5mBOctMAZOXrWlZQE9Fxpc77zv5Pz4sB5Z5euJVwT1AHbXzl2gCnWmk5HbHUgx0sW fR+8sVQ9BdK5RFU0FYnQb91s4apxV5v90H671dFxnYlxqNoVn2iAuwNr2XjVGgw5OMyhK+UVHP6 UzjZLfoKUk6qM/+oVgxCfkKfQ3KU+0T7C63z6dT2MATKDlYvz5AhSVA3Kb5U3GzjtybRwX5lQYK HUyhO1NoYknyEd3If9w== X-Proofpoint-ORIG-GUID: PzTO7NmBvndZ07MHb782o0T8lYWG6g__ X-Authority-Analysis: v=2.4 cv=KezfcAYD c=1 sm=1 tr=0 ts=697a39a2 cx=c_pps a=wEP8DlPgTf/vqF+yE6f9lg==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=Nk4IflzP70UQ0qszZz0A:9 a=QEXdDO2ut3YA:10 a=bBxd6f-gb0O0v-kibOvt:22 X-Proofpoint-GUID: PzTO7NmBvndZ07MHb782o0T8lYWG6g__ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-01-28_03,2026-01-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 impostorscore=0 suspectscore=0 malwarescore=0 clxscore=1015 spamscore=0 bulkscore=0 phishscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601280136 On 1/19/2026 10:37 PM, Zilin Guan wrote: > The functions ath11k_mac_setup_bcn_tmpl_ema() and > ath11k_mac_setup_bcn_tmpl_mbssid() allocate memory for beacon templates > but fail to free it when parameter setup returns an error. > > Since beacon templates must be released during normal execution, they > must also be released in the error handling paths to prevent memory > leaks. > > Fix this by adding the missing deallocation calls in the respective > error paths. > > Compile tested only. Issue found using a prototype static analysis tool > and code review. > > Fixes: 3a415daa3e8b ("wifi: ath11k: add P2P IE in beacon template") > Fixes: 335a92765d30 ("wifi: ath11k: MBSSID beacon support") > Suggested-by: Baochen Qiang > Signed-off-by: Zilin Guan > --- > Changes in v2: > - Use unified exit paths for cleanup. > > drivers/net/wireless/ath/ath11k/mac.c | 25 +++++++++++++++---------- > 1 file changed, 15 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c > index 4dfd08b58416..42edcc5e9e49 100644 > --- a/drivers/net/wireless/ath/ath11k/mac.c > +++ b/drivers/net/wireless/ath/ath11k/mac.c > @@ -1561,8 +1561,10 @@ static int ath11k_mac_setup_bcn_tmpl_ema(struct ath11k_vif *arvif, while looking to apply this patch I noticed the following logic earlier in the function: beacons = ieee80211_beacon_get_template_ema_list(tx_arvif->ar->hw, tx_arvif->vif, 0); if (!beacons || !beacons->cnt) { ath11k_warn(arvif->ar->ab, "failed to get ema beacon templates from mac80211\n"); return -EPERM; } I did not look at ieee80211_beacon_get_template_ema_list() But if it is possible that this can return a valid beacons pointer with beacons->cnt == 0, then won't this also leak the beacons allocation? Given that ieee80211_beacon_free_ema_list(beacons) can handle a NULL beacons pointer, perhaps this should also goto free? > } > > if (tx_arvif == arvif) { > - if (ath11k_mac_set_vif_params(tx_arvif, beacons->bcn[0].skb)) > - return -EINVAL; > + if (ath11k_mac_set_vif_params(tx_arvif, beacons->bcn[0].skb)) { > + ret = -EINVAL; > + goto free; > + } > } else { > arvif->wpaie_present = tx_arvif->wpaie_present; > } > @@ -1589,11 +1591,11 @@ static int ath11k_mac_setup_bcn_tmpl_ema(struct ath11k_vif *arvif, > } > } > > - ieee80211_beacon_free_ema_list(beacons); > - > if (tx_arvif != arvif && !nontx_vif_params_set) > - return -EINVAL; /* Profile not found in the beacons */ > + ret = -EINVAL; /* Profile not found in the beacons */ > > +free: > + ieee80211_beacon_free_ema_list(beacons); > return ret; > } > > @@ -1622,19 +1624,22 @@ static int ath11k_mac_setup_bcn_tmpl_mbssid(struct ath11k_vif *arvif, > } > > if (tx_arvif == arvif) { > - if (ath11k_mac_set_vif_params(tx_arvif, bcn)) > - return -EINVAL; > + if (ath11k_mac_set_vif_params(tx_arvif, bcn)) { > + ret = -EINVAL; > + goto free; > + } > } else if (!ath11k_mac_set_nontx_vif_params(tx_arvif, arvif, bcn)) { > - return -EINVAL; > + ret = -EINVAL; > + goto free; > } > > ret = ath11k_wmi_bcn_tmpl(ar, arvif->vdev_id, &offs, bcn, 0); > - kfree_skb(bcn); > - > if (ret) > ath11k_warn(ab, "failed to submit beacon template command: %d\n", > ret); > > +free: > + kfree_skb(bcn); > return ret; > } >