From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 30BF03AA514 for ; Mon, 11 May 2026 07:57:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778486230; cv=none; b=hfjH8vCIEOiajLjaM34AOgbhtyPTYAkYY5152qxhMnVmYY/qJoZgXVPJ3IXDXUuZFjNxSfQ9gKemn/z5+moWn1vRYQXYoSAVBT/fdoijsxirKXfKuFBlqoi50YNkyrAM8POrdSJgMGYMZ+yumKxk+s9D90dkATkoDcgqmpPxw68= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778486230; c=relaxed/simple; bh=8fKsYpQ2rofgYvPFqVTqHqV3iwH1OdGnQ3Q0OFMQAZs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=DVMdyZgs+9FgIR45HDySML6SMxqd/zahqTGpXhDckPrKqTyvCFUFlVWl+/Wp7ClU4DDRRuwJTV+dvbR/xvZDpHPQiIdYC9xkVbYtBPn0rFPdDLwtQQHpdvBCdLRzUDpRuZWSefGWIWnBxUXVdOLuL/18hlR2vyPN0kZoO6PJhuQ= 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=f+zTVlho; arc=none smtp.client-ip=209.85.210.180 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="f+zTVlho" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-82faf871346so2861060b3a.0 for ; Mon, 11 May 2026 00:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778486218; x=1779091018; 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=SuDIDre46wS+yv63NbwPzOOkKtvuj3ZvNxFH0y1TnKY=; b=f+zTVlhokB90lRHfBWoCedoqsBEu9XCTA9heaFXin8XTojburHmH+SIn+JKDuIRw0n Y3UrfJP5OGoexgkY5jz3u7jnNoM4/0Bryw8d0Nnpxem21KRPRGoO1ShO6aXdlHwZoGlN hafhJZ9WfF09VnVX25ORkuy1iBot5m5o/6d2rCk62h/+pFLLc8ef3QN3yEH0DLRKnBRd /iTGAyIFDTibOCIIQM3fcIptWCZ83SbUHQcRFIfFmD/5/pcg7r0443EOO+r/B0OGGXLz JSk2oFnAksQKlZNviHDUUOEsvxBYLVt4AylH6ROPUgUykgU4MAME9itgkNRASGa588fT DptQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778486218; x=1779091018; 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=SuDIDre46wS+yv63NbwPzOOkKtvuj3ZvNxFH0y1TnKY=; b=On6EfUQ8DK5FdEUUfcpRBU5jSHJvpFjAP1b//q8XeOjkgi8EbTDhXLKngID9G5kXtf wUNi44EYNvR0t8s2y4dzs8XNzgqDKosegWBU3XnySMa7JWgfJRZ9GHjX8wNdYt5ayHp4 vDUGAfvFVfhBMCiOKD+jidpWC8Vjcn23o7cSBBHg29N76FAdGYYk6KlkHHLNnRdqN2MP jSi0CdPLkkzfDjnEAFFky/2pxbYk/VUp24el8COPDWvD8TE3G3kJ5CQPrdyM+IiEpla6 Od/S1PYGUnDugcpS0wBhEoYg2a0XN7l8jsLlQEomkOui0g9lSpW3gt1JSzEvrRMkhgFv vKWA== X-Forwarded-Encrypted: i=1; AFNElJ9d/8JQ5abghRfB7mMS4RyPCxmMv8Td7Wvm/8DFonqBr+kN+kVFZmertuVbig3/XxwkoDFTDFnAjH/fOmI=@vger.kernel.org X-Gm-Message-State: AOJu0YwE5IoYU85nbSkamzP4NBUWeNkmgM5RPzNV8BIMNf4uR1RQcpX/ XOpPOVqOaYiNLgGnwsNHP+N4wCJqYQOE7erOXJp4TbBHEjIo9qA1tvlf X-Gm-Gg: Acq92OHeT7pFeEgA2x5fjkwLcXV3jRzNnLDEVSPp9/NMk9VXcdZyvIYEcgfXkuPqC1v GRlXLvZ7vaH2z+CovqH0aYaYfw86sAgq+Zp7TC14hbSVP4FsfJ/TQflQZTN8ZyMAY3DMNRhO5qs vl5w9c8Wx0McK5lFCc3GWn5SmjzoeOY2T6s8U0iIHWy50xVU9n/pFLVwPaJyWtTD+xy0pa6nmWL IYs5aM6F6i3djE54qQm5UZ1ZPfE5cmUiXXOkhWCbgz+eFJY/mADZDh9Mv64NXkQfS7lUjEaJaqw LfCoEQxyE60UPC1RG+sT3dMxGsrDn6Xm4n9Omp5VRQClH6w0xRV25eg/IyvsrWVxz15jrdP+yN9 fFb4DGIjjJT766ArcJMkjbsyt2gy0Y7LRXqypMcCqR1HZSkrm+YtEWw8yiGX05WK8/5hSb7n16G l5O7MYsaiBnoEZedqM/F/R1iX8KiD3qcl3alqbm9sfMzO27qTNcA2JzM/IjY9IlHgY3SjvZbhqh wn5pLZw/k3UKjrLdoodbOQAk/Xqe90711c= X-Received: by 2002:a05:6a00:cc1:b0:827:2a07:231d with SMTP id d2e1a72fcca58-83a5c4bfddamr21886438b3a.17.1778486217918; Mon, 11 May 2026 00:56:57 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83967dbcf36sm23680825b3a.41.2026.05.11.00.56.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 00:56:57 -0700 (PDT) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: Christian Lamparter , Kees Cook , "Gustavo A. R. Silva" , 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 wireless-next] wifi: p54: Use flexible array for channel list Date: Mon, 11 May 2026 00:56:40 -0700 Message-ID: <20260511075640.446181-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Store generated channel entries in the p54 channel list allocation instead of allocating them separately. This ties the temporary channel entries to the list lifetime, removes a separate allocation failure path, and lets __counted_by() describe the array bounds. Assisted-by: Codex:GPT-5.5 Signed-off-by: Rosen Penev --- drivers/net/wireless/intersil/p54/eeprom.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/intersil/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c index 95580921d933..c617bec787a3 100644 --- a/drivers/net/wireless/intersil/p54/eeprom.c +++ b/drivers/net/wireless/intersil/p54/eeprom.c @@ -77,10 +77,10 @@ struct p54_channel_entry { }; struct p54_channel_list { - struct p54_channel_entry *channels; size_t entries; size_t max_entries; size_t band_channel_num[NUM_NL80211_BANDS]; + struct p54_channel_entry channels[] __counted_by(max_entries); }; static int p54_get_band_from_freq(u16 freq) @@ -335,24 +335,21 @@ static int p54_generate_channel_lists(struct ieee80211_hw *dev) max_channel_num = max_t(unsigned int, max_channel_num, priv->curve_data->entries); - list = kzalloc_obj(*list); + list = kzalloc_flex(*list, channels, max_channel_num); if (!list) { ret = -ENOMEM; goto free; } - priv->chan_num = max_channel_num; + + list->max_entries = max_channel_num; + priv->survey = kzalloc_objs(struct survey_info, max_channel_num); if (!priv->survey) { ret = -ENOMEM; goto free; } - list->max_entries = max_channel_num; - list->channels = kzalloc_objs(struct p54_channel_entry, max_channel_num); - if (!list->channels) { - ret = -ENOMEM; - goto free; - } + priv->chan_num = max_channel_num; for (i = 0; i < max_channel_num; i++) { if (i < priv->iq_autocal_len) { @@ -401,10 +398,7 @@ static int p54_generate_channel_lists(struct ieee80211_hw *dev) } free: - if (list) { - kfree(list->channels); - kfree(list); - } + kfree(list); if (ret) { kfree(priv->survey); priv->survey = NULL; -- 2.54.0