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 10349393DFE for ; Tue, 20 Jan 2026 07:19:20 +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=1768893569; cv=none; b=N4L/IZcIKUa/Sl4UIG1bmM7vzK53SJyvfF7OrA34Mtrb2S+mwdOTtyKD2gUbIs5INWNxQ5iW9+QIgjiQll5S9GM/LZViib8f6h5AarwHidpbL/jGZ5g+8CeJf5PqVrN6O8aH4utHrF0PGuGRnhAjOgJRKvxzLn9oe9QiGMDAK9g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768893569; c=relaxed/simple; bh=Am4DASNIaChGbG8aHFcpMHq+BSTcDGBgY9be0xM7k4g=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=uc1xcIIrIoXy5ZTdkd0dOAaUU/SoOz4t6zMC5zUo+grHwPgYXfJ0yiyqGOSE7PtPK6ODuwKxHPJVeTeGh/5eItCfwKhz6A9R7Zi+rKl4DKOlbWoIPPY7g4StUdWkzZtmFkfNP3uLJC81H6pyTWnB/HCBdVYZci8o3D6zrTQYdfY= 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=jxuO37Ci; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Baodj58i; 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="jxuO37Ci"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Baodj58i" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60K188FH3366082 for ; Tue, 20 Jan 2026 07:19:16 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= gd7D/YUZzVo2knwthSbnndhf1Qb341qujHUYrRBqbTw=; b=jxuO37CiV/zMaSZ0 Dbhx+SlKE1KgIcWMQijlbPhYDWLxtYUbl5q/+OM2Nch6M+W9EZiEHRMmy3WeMBGT xJpnRuTunGrZwI/N3PLvOr9GxdnQoaIp5+OlTiH/OEWamu+PJy67Y2nVovH+9woA yN2XllfRLNfUewWa6m+B5nf1EK7o+uV/xgWDgsXOkn2e8lgnm9A2P1McXTdPE1wL sKCx3fUZEIoN/wmzM1fCu4dw4vmQivexHCetmmC7Zx3u7wRQjih1SfTYb3aumwXK 3HS0i1pAdHCfk+GbA91x27BHhWy0yZlMJxbN7OnNwNRKfwG4PidLUnZ2YnhWuKBh a7HZaA== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bsysb0wvt-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 20 Jan 2026 07:19:16 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2a0bb1192cbso46453595ad.1 for ; Mon, 19 Jan 2026 23:19:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768893556; x=1769498356; 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=gd7D/YUZzVo2knwthSbnndhf1Qb341qujHUYrRBqbTw=; b=Baodj58iOwPjSJUgwZzxOnG/HpALI4Lzrh1handlGddBF9aey6QVnGh0STs0iugyq8 Vd8CdnNRAavj5eprfrmqV1fUim6HJN7Nfr0v8GArTcoSapYTvOG2ReeoDrqsngimf7TJ HAocBCAqU4kNponNICOoWrkK4UbMLmxc/nvDrB7p01rQeOHTLBkZpDMMcyzU93o3UUmT YILP9gb4COt8s0fQ9gc1T5MIiZYn+yTTN+1hdKmtkAx8vIBtEpWr4vkZYMSSpYuAdPr1 vmPYaoHVRTWE7dGtJJMKxlrFIeyb7DyaNOyspod4W8nfpFXEe+VCk5WF3y04EHU+qFhZ p74A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768893556; x=1769498356; 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=gd7D/YUZzVo2knwthSbnndhf1Qb341qujHUYrRBqbTw=; b=A30wzhftfn8NNZDlqx09QUobq1GZc8AAjHNe9BaEHOq9PRW2grU11Y6tv8YzYJlen/ NUgfjduZ4QdFdxhPyNJdSOHUYdYJunHhATjjmlY73QFjUE7iQakl/7dN819A/6a8qGRh AW09lSPrKhqMnKsfcX5DA0VJXbDVJTKDSt/tDXiAo+/luRZdYih2LmRWx/1SkDWsXIcv W1ntMy6zIIUJVKJA/KgHq0AVO68dUVo0kF9TFKcQ2KUA2XTrgv24xEDwdL4gVVpdRp63 JqitGkw6BXqkD5PHBJtmC2tWLQOUmavD02zo1gErtaasUNey9rLLqa0Zh9eRd/+33c8H Kfsg== X-Forwarded-Encrypted: i=1; AJvYcCXMRQU0VH74VE7s2cacXXA8coaZalRpaaVmjUV3xj1KZv/25I6snaM3DAPOEDxzn+HIl8JNpdCyzYHrxXM=@vger.kernel.org X-Gm-Message-State: AOJu0YwfKSjt+Gac/vt2rF3g3mpD9t2d+XdpJbSrisokVHRUnaI9doas yPd2b4BTgIFjKieZOyC7xMPa+zUA/iF/Cgvgq8B03xlIHHGB+L9Cwiv8d0HgbpUKQ3er9yrkx0h CoMP8wJSiayDDPIgjk88TizaSMal8ftW0hwk0KpTz9D6d8Gdmyxu6Q4yGtiLAVyqUW+A= X-Gm-Gg: AZuq6aLnVyO+y7AWb0bY0289jk+yV9A9MHh0JxX/DF449tBGeWj4TDkY1RWNlqJi6GP w3deuVmqgfyWyMsfL7T0UJC0rccdxcvABK4RbfhOhfJ1czo4KPPqIby5CdXe5OdDLFNV6hCgUWr +v+W7kBmn/HPNGuCTgYcSx00uTGi953Vaxl6nVupGueIiKveoQUJ1EEw8IA42yNE7RDBaedQOjs zh8J9d1ZVXb9q+8OSzRlMdJfET7qjPTgewm7lGwZwQytiSsENw95XwMLy9skKlWvCCeqju0AXtr b5F7gI21cGua//bPc2NeFv7mV8tVQib7Nqrau2G2Ss096kkuYpFFs26wjgY6SWpw9B13/9TuHV3 VDCWfRGaIOGVeAcvJOzhxGKwfkBwCh5M5Ck41bF8IyzZd+tiIiKGqHfC4giU0WGrbsbLFhjpcoT 8MeHaSrsI= X-Received: by 2002:a17:902:c40c:b0:2a1:35df:2513 with SMTP id d9443c01a7336-2a717533c8dmr132039345ad.17.1768893555632; Mon, 19 Jan 2026 23:19:15 -0800 (PST) X-Received: by 2002:a17:902:c40c:b0:2a1:35df:2513 with SMTP id d9443c01a7336-2a717533c8dmr132039265ad.17.1768893555137; Mon, 19 Jan 2026 23:19:15 -0800 (PST) Received: from [10.133.33.150] (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a7190ce6a9sm116209015ad.34.2026.01.19.23.19.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Jan 2026 23:19:14 -0800 (PST) Message-ID: <40ccd4fc-33c8-41b5-b68e-4e590a5a6ec5@oss.qualcomm.com> Date: Tue, 20 Jan 2026 15:19:09 +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: 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: Baochen Qiang 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-GUID: WsyXw8zSrERy3LjP_M_NAoz-5D-diyHX X-Authority-Analysis: v=2.4 cv=XJ89iAhE c=1 sm=1 tr=0 ts=696f2c74 cx=c_pps a=MTSHoo12Qbhz2p7MsH1ifg==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=cJDDEaPil63sA2faZhwA:9 a=QEXdDO2ut3YA:10 a=GvdueXVYPmCkWapjIL-Q:22 X-Proofpoint-ORIG-GUID: WsyXw8zSrERy3LjP_M_NAoz-5D-diyHX X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTIwMDA1OSBTYWx0ZWRfX9W1/qzjAL28I eo99WFwebu4eC+4B01EZeW/9U7vD6hQACFcX/FY7qVgQ3CLmzbpwEn9SIqAAXHyxJ65yC8i82mz n+6DbYMHO6UAXL5Apcm5HE5ywMaksH3PGvR2tAvyoRebp/VQQN9qjjTJYccmbHloK654sq3QZ4k IvxkDddvOF2nAYgsjyuIc7yxej/dtrB2rZMlEFXAlG5HGL+fPShPnhjVhm3kgtdsv42hiw7n5QT AOFbo+MjOXUHekzl6ViCvOsaTph4gdCbI/3T/fN+ysy05SnC+claD+8pEcbtLVyLBQEStrAuXJs 4086MELeeLn7aBw5BHF8S2HdPcviqExH7OClDORywai+1v4OVpIsII0fI/VUneuDHA2dPmGOCRk jvkcE6StP68PgOkq5bD9FVoNehIdByag5HP9vOn3KO/PnNc+2ILwposdZTkIX892zDvlT5zJGsU ybttYXxigw7eMdFZ5MA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-20_01,2026-01-19_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 impostorscore=0 adultscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601200059 On 1/20/2026 2: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, > } > > 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; > } > Reviewed-by: Baochen Qiang