From nobody Tue Apr 7 14:36:43 2026 Received: from mail-yx1-f42.google.com (mail-yx1-f42.google.com [74.125.224.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DEEE3AC00 for ; Fri, 13 Mar 2026 00:14:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773360898; cv=none; b=L/dO/RH0kA6muKR60rBxhPzREepQqwq28/7Zg+Q8zoMGtcB/xJMVpCUCkD9o6MzLoDf7CPFC/5vdfPK3KX4SLDFZtUQndsrNVbtadQAMc6r/8i7h1N2mdxdwnZTipqpxMJi0pxkvGYH/eRm8NurrHXwhHUvsnUdtGVVNhvvkcVo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773360898; c=relaxed/simple; bh=MPvp3uLpYzLrrjOQiqIHZIR+DFjBEGgkZpOibNsBV8k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=MNON7NgH9sjQDFPZMn5EXhkXwMmE9fmempCB3hZoULRBp6F9MUT/NLnwmFdBapAxsLEeVkvHDX+ttTkIV2d+Ox3PTUhU8vixTYLgZv8GPra5u8ADiRAyzuykeZqu4g9odOMyg5Ti3S00lIJkdlnTz1/DxnYGkHlvyzmv/VOfQUM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=O76BbDku; arc=none smtp.client-ip=74.125.224.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="O76BbDku" Received: by mail-yx1-f42.google.com with SMTP id 956f58d0204a3-64ad79dfb7cso2032501d50.2 for ; Thu, 12 Mar 2026 17:14:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773360893; x=1773965693; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Dc7T6F+QAAK7xJvWNMAT28cNkHEqvmKrsbYs4miggWQ=; b=O76BbDkuck5vvz7A8wf9+5wypQdsSgZjWV7PzA3HgzjIigk0kIoiKe/+dKdgiaQVAa Oe9kWixok3PxxopqDz8o9k8uW6ba66uZpRNJPV/amtcu99gS8lB6yE9bKY38FcSYIm1d 2OCpRriHUduMKb4e0k2ET/4fB4MMzPQNogHP2NiZordYGC+sWEqLSkoSa0kXrIFVjqa3 s349IlnEhNLI9Haf/lcFLmsCkUBe2L05bQP04i33zASuxAdW4IzGk8qllpqmDWgnrqGb 5T7achmq+ebfl3Zl2GuKnAY1RJ2EVFuHD30q90ve+IcPvTCTSMsWTz3JZn7EuS9u1g/g /nGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773360893; x=1773965693; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Dc7T6F+QAAK7xJvWNMAT28cNkHEqvmKrsbYs4miggWQ=; b=k4eAMwtCPgn37Iwe9LmHjK5CQHfU91pbmKCZgUxEs95x/T9VtUSqJvzhP9Zu46x7CA H3cQv/3KflvOL+i+qL8zjenw9vA+edCU4PZeAk5lQHQaetZwVNxJL30vNWbh3n0tdhfg lxZeQJYmhUStQqY4tvANY1m47WiKOyLdN/hIKJgwzsbY2x9rtkOdphd05VdPAP8Q1vve kL7aNOyONsUFI/fmS8DZBuLpQNiCWIbi48u+MX5Q0Q6/ddsurwR7H1BOKSe4ZgthdXpL eEO0V3Ym3BDWgLRVpq96r28QEoREDfjPbI9ak89FYULyBPQ9qV42gsB1AhZFrlQl3T6Z WLhg== X-Forwarded-Encrypted: i=1; AJvYcCXa3w0T5KP+4CoEl3KOulqWo3imFKnXyv6jqit78skr1b23TcMVbodaABf3XlZcn408EXO00a1kzQ2cwjg=@vger.kernel.org X-Gm-Message-State: AOJu0YzepBuaCqZ3B4lKmdWc175ya5r7CmpT7JIMWCIGljA3Qt8hY2JP leKGmR1B0aa3wqsZl3XRRzi6jywP1ui6Fhw86HxhK15knRwj6TjpZ/oG X-Gm-Gg: ATEYQzy+pXrSoWfTrjpImjt7n5v2vsy53k6W/NKoTWJwcPzsGguHP2vbuT2LkAmkxPf 5/On73jEhZO96XhHp25FLv9tJS4Vrpw3HjBeB2RMfk6730V1NvpRRYC/11wztR/8LV39HflU2Hh c8wj0p4gPkEZt58ygRqxbedK13xwOqq4HnLdRtfrcq1VRLt+RETO1QkOFO6b1FukbM6nCfvYgID fkBVzrI7y0QhD9K63zv1adgLmX9ZFx2AHqGdvqbN+NlaKoosTe4HcQsDhrbmb1qwou4BP1CM5e7 4ZUbRnIiojrto+1/ml/L8VbbgsAYllt6mm1lTo08d2Iat2OgtC7u+GtdH7Q52vNNcSHTPP+KJjl tKL69m6CIO2WR6U3S6Eb7mCpceB554TVxof6QVeXXhZzpw4MDDXbgyVnPGOdt+0uGyQaS3l/J/J khMqXdvuHxHA1scdko7E08f9PH+R3pR497KR6W7ppJ3PhnwfYteJSX9zLJSalItz97 X-Received: by 2002:a05:690c:6f13:b0:798:11ac:d0ac with SMTP id 00721157ae682-79a1c1e5451mr16754597b3.53.1773360893250; Thu, 12 Mar 2026 17:14:53 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id 00721157ae682-79917e1fa3esm41018377b3.18.2026.03.12.17.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 17:14:52 -0700 (PDT) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: Jeff Johnson , Kees Cook , "Gustavo A. R. Silva" , ath12k@lists.infradead.org (open list:QUALCOMM ATH12K WIRELESS DRIVER), linux-kernel@vger.kernel.org (open list), linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be)?\b) Subject: [PATCH ath-next] wifi: ath12k: use kzalloc_flex Date: Thu, 12 Mar 2026 17:14:34 -0700 Message-ID: <20260313001434.118010-1-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Convert kzalloc_obj + kcalloc to kzalloc_flex to save an allocation. Add __counted_by to get extra runtime analysis. Move counting variable assignment immediately after allocation as required by __counted_by. Signed-off-by: Rosen Penev --- drivers/net/wireless/ath/ath12k/mac.c | 29 +++++++-------------------- drivers/net/wireless/ath/ath12k/wmi.h | 2 +- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/a= th/ath12k/mac.c index 553ec28b6aaa..b7c43a64e37b 100644 --- a/drivers/net/wireless/ath/ath12k/mac.c +++ b/drivers/net/wireless/ath/ath12k/mac.c @@ -5611,12 +5611,14 @@ static int ath12k_mac_initiate_hw_scan(struct ieee8= 0211_hw *hw, if (ret) goto exit; - arg =3D kzalloc_obj(*arg); + arg =3D kzalloc_flex(*arg, chan_list, n_channels); if (!arg) { ret =3D -ENOMEM; goto exit; } + arg->num_chan =3D n_channels; + ath12k_wmi_start_scan_init(ar, arg); arg->vdev_id =3D arvif->vdev_id; arg->scan_id =3D ATH12K_SCAN_ID; @@ -5638,18 +5640,8 @@ static int ath12k_mac_initiate_hw_scan(struct ieee80= 211_hw *hw, arg->scan_f_passive =3D 1; } - if (n_channels) { - arg->num_chan =3D n_channels; - arg->chan_list =3D kcalloc(arg->num_chan, sizeof(*arg->chan_list), - GFP_KERNEL); - if (!arg->chan_list) { - ret =3D -ENOMEM; - goto exit; - } - - for (i =3D 0; i < arg->num_chan; i++) - arg->chan_list[i] =3D chan_list[i]->center_freq; - } + for (i =3D 0; i < arg->num_chan; i++) + arg->chan_list[i] =3D chan_list[i]->center_freq; ret =3D ath12k_start_scan(ar, arg); if (ret) { @@ -5674,7 +5666,6 @@ static int ath12k_mac_initiate_hw_scan(struct ieee802= 11_hw *hw, exit: if (arg) { - kfree(arg->chan_list); kfree(arg->extraie.ptr); kfree(arg); } @@ -13735,19 +13726,13 @@ int ath12k_mac_op_remain_on_channel(struct ieee80= 211_hw *hw, scan_time_msec =3D hw->wiphy->max_remain_on_channel_duration * 2; struct ath12k_wmi_scan_req_arg *arg __free(kfree) =3D - kzalloc_obj(*arg); + kzalloc_flex(*arg, chan_list, 1); if (!arg) return -ENOMEM; - ath12k_wmi_start_scan_init(ar, arg); arg->num_chan =3D 1; + ath12k_wmi_start_scan_init(ar, arg); - u32 *chan_list __free(kfree) =3D kcalloc(arg->num_chan, sizeof(*chan_list= ), - GFP_KERNEL); - if (!chan_list) - return -ENOMEM; - - arg->chan_list =3D chan_list; arg->vdev_id =3D arvif->vdev_id; arg->scan_id =3D ATH12K_SCAN_ID; arg->chan_list[0] =3D chan->center_freq; diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/a= th/ath12k/wmi.h index 0bf0a7941cd3..190e7a4a92d0 100644 --- a/drivers/net/wireless/ath/ath12k/wmi.h +++ b/drivers/net/wireless/ath/ath12k/wmi.h @@ -3586,7 +3586,6 @@ struct ath12k_wmi_scan_req_arg { u32 num_bssid; u32 num_ssids; u32 n_probes; - u32 *chan_list; u32 notify_scan_events; struct cfg80211_ssid ssid[WLAN_SCAN_MAX_NUM_SSID]; struct ath12k_wmi_mac_addr_params bssid_list[WLAN_SCAN_MAX_NUM_BSSID]; @@ -3595,6 +3594,7 @@ struct ath12k_wmi_scan_req_arg { u32 num_hint_bssid; struct ath12k_wmi_hint_short_ssid_arg hint_s_ssid[WLAN_SCAN_MAX_HINT_S_SS= ID]; struct ath12k_wmi_hint_bssid_arg hint_bssid[WLAN_SCAN_MAX_HINT_BSSID]; + u32 chan_list[] __counted_by(num_chan); }; struct wmi_ssid_arg { -- 2.53.0