Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL usesHEADtorvalds/mastertorvalds/HEADmaster

Conversion performed via this Coccinelle script:

  // SPDX-License-Identifier: GPL-2.0-only
  // Options: --include-headers-for-types --all-includes --include-headers --keep-comments
  virtual patch

  @gfp depends on patch && !(file in "tools") && !(file in "samples")@
  identifier ALLOC = {kmalloc_obj,kmalloc_objs,kmalloc_flex,
 		    kzalloc_obj,kzalloc_objs,kzalloc_flex,
		    kvmalloc_obj,kvmalloc_objs,kvmalloc_flex,
		    kvzalloc_obj,kvzalloc_objs,kvzalloc_flex};
  @@

  	ALLOC(...
  -		, GFP_KERNEL
  	)

  $ make coccicheck MODE=patch COCCI=gfp.cocci

Build and boot tested x86_64 with Fedora 42's GCC and Clang:

Linux version 6.19.0+ (user@host) (gcc (GCC) 15.2.1 20260123 (Red Hat 15.2.1-7), GNU ld version 2.44-12.fc42) #1 SMP PREEMPT_DYNAMIC 1970-01-01
Linux version 6.19.0+ (user@host) (clang version 20.1.8 (Fedora 20.1.8-4.fc42), LLD 20.1.8) #1 SMP PREEMPT_DYNAMIC 1970-01-01

Signed-off-by: Kees Cook <kees@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

23 files changed, 30 insertions, 39 deletions

diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c
index 7ec8be82c1c9..0c1138407838 100644
--- a/drivers/net/wireless/ath/ath11k/debugfs.c
+++ b/drivers/net/wireless/ath/ath11k/debugfs.c
@@ -1216,8 +1216,7 @@ static int ath11k_debugfs_dbr_dbg_init(struct ath11k *ar, int dbr_id)
 	dbr_dbg_data->num_ring_debug_entries = ATH11K_DEBUG_DBR_ENTRIES_MAX;
 	dbr_dbg_data->dbr_debug_idx = 0;
 	dbr_dbg_data->entries = kzalloc_objs(struct ath11k_dbg_dbr_entry,
-					     ATH11K_DEBUG_DBR_ENTRIES_MAX,
-					     GFP_KERNEL);
+					     ATH11K_DEBUG_DBR_ENTRIES_MAX);
 	if (!dbr_dbg_data->entries)
 		return -ENOMEM;
 
diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c
index 715e561bf8ca..1c82d927d27b 100644
--- a/drivers/net/wireless/ath/ath12k/dp.c
+++ b/drivers/net/wireless/ath/ath12k/dp.c
@@ -408,7 +408,7 @@ static int ath12k_dp_init_bank_profiles(struct ath12k_base *ab)
 
 	dp->num_bank_profiles = num_tcl_banks;
 	dp->bank_profiles = kmalloc_objs(struct ath12k_dp_tx_bank_profile,
-					 num_tcl_banks, GFP_KERNEL);
+					 num_tcl_banks);
 	if (!dp->bank_profiles)
 		return -ENOMEM;
 
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 7b945a010ea1..05c9c07591fc 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -920,7 +920,7 @@ ath5k_desc_alloc(struct ath5k_hw *ah)
 		ds, ah->desc_len, (unsigned long long)ah->desc_daddr);
 
 	bf = kzalloc_objs(struct ath5k_buf,
-			  1 + ATH_TXBUF + ATH_RXBUF + ATH_BCBUF, GFP_KERNEL);
+			  1 + ATH_TXBUF + ATH_RXBUF + ATH_BCBUF);
 	if (bf == NULL) {
 		ATH5K_ERR(ah, "can't allocate bufptr\n");
 		ret = -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index 9e4983d31628..e163706f8728 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -728,7 +728,7 @@ ath5k_eeprom_convert_pcal_info_5111(struct ath5k_hw *ah, int mode,
 		/* Allocate pd_curves for this cal pier */
 		chinfo[pier].pd_curves =
 			kzalloc_objs(struct ath5k_pdgain_info,
-				     AR5K_EEPROM_N_PD_CURVES, GFP_KERNEL);
+				     AR5K_EEPROM_N_PD_CURVES);
 
 		if (!chinfo[pier].pd_curves)
 			goto err_out;
@@ -916,8 +916,7 @@ ath5k_eeprom_convert_pcal_info_5112(struct ath5k_hw *ah, int mode,
 		/* Allocate pd_curves for this cal pier */
 		chinfo[pier].pd_curves =
 				kzalloc_objs(struct ath5k_pdgain_info,
-					     AR5K_EEPROM_N_PD_CURVES,
-					     GFP_KERNEL);
+					     AR5K_EEPROM_N_PD_CURVES);
 
 		if (!chinfo[pier].pd_curves)
 			goto err_out;
@@ -1206,8 +1205,7 @@ ath5k_eeprom_convert_pcal_info_2413(struct ath5k_hw *ah, int mode,
 		/* Allocate pd_curves for this cal pier */
 		chinfo[pier].pd_curves =
 				kzalloc_objs(struct ath5k_pdgain_info,
-					     AR5K_EEPROM_N_PD_CURVES,
-					     GFP_KERNEL);
+					     AR5K_EEPROM_N_PD_CURVES);
 
 		if (!chinfo[pier].pd_curves)
 			goto err_out;
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index 1e796087435d..b8cb736a7185 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -2442,7 +2442,7 @@ int wil6210_debugfs_init(struct wil6210_priv *wil)
 		return -ENODEV;
 
 	wil->dbg_data.data_arr = kzalloc_objs(struct wil_debugfs_iomem_data,
-					      dbg_off_count, GFP_KERNEL);
+					      dbg_off_count);
 	if (!wil->dbg_data.data_arr) {
 		debugfs_remove_recursive(dbg);
 		wil->debug = NULL;
diff --git a/drivers/net/wireless/broadcom/b43legacy/debugfs.c b/drivers/net/wireless/broadcom/b43legacy/debugfs.c
index 22811359d89d..3ad99124d522 100644
--- a/drivers/net/wireless/broadcom/b43legacy/debugfs.c
+++ b/drivers/net/wireless/broadcom/b43legacy/debugfs.c
@@ -366,7 +366,7 @@ void b43legacy_debugfs_add_device(struct b43legacy_wldev *dev)
 	e->dev = dev;
 	log = &e->txstatlog;
 	log->log = kzalloc_objs(struct b43legacy_txstatus,
-				B43legacy_NR_LOGGED_TXSTATUS, GFP_KERNEL);
+				B43legacy_NR_LOGGED_TXSTATUS);
 	if (!log->log) {
 		b43legacyerr(dev->wl, "debugfs: add device txstatus OOM\n");
 		kfree(e);
diff --git a/drivers/net/wireless/broadcom/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c
index aba1168ab728..6b3e0b2bbca7 100644
--- a/drivers/net/wireless/broadcom/b43legacy/main.c
+++ b/drivers/net/wireless/broadcom/b43legacy/main.c
@@ -3270,7 +3270,7 @@ static int b43legacy_wireless_core_init(struct b43legacy_wldev *dev)
 	if ((phy->type == B43legacy_PHYTYPE_B) ||
 	    (phy->type == B43legacy_PHYTYPE_G)) {
 		phy->_lo_pairs = kzalloc_objs(struct b43legacy_lopair,
-					      B43legacy_LO_COUNT, GFP_KERNEL);
+					      B43legacy_LO_COUNT);
 		if (!phy->_lo_pairs)
 			return -ENOMEM;
 	}
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
index a88abe390aee..ba1ce1552e0f 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
@@ -1589,7 +1589,7 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
 	msgbuf->max_flowrings = if_msgbuf->max_flowrings;
 	msgbuf->flowring_dma_handle =
 		kzalloc_objs(*msgbuf->flowring_dma_handle,
-			     msgbuf->max_flowrings, GFP_KERNEL);
+			     msgbuf->max_flowrings);
 	if (!msgbuf->flowring_dma_handle)
 		goto fail;
 
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
index 8837f44fd06b..248a051da52d 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
@@ -1886,7 +1886,7 @@ static int ipw2100_wdev_init(struct net_device *dev)
 		bg_band->band = NL80211_BAND_2GHZ;
 		bg_band->n_channels = geo->bg_channels;
 		bg_band->channels = kzalloc_objs(struct ieee80211_channel,
-						 geo->bg_channels, GFP_KERNEL);
+						 geo->bg_channels);
 		if (!bg_band->channels) {
 			ipw2100_down(priv);
 			return -ENOMEM;
@@ -4408,7 +4408,7 @@ static int ipw2100_tx_allocate(struct ipw2100_priv *priv)
 	}
 
 	priv->tx_buffers = kmalloc_objs(struct ipw2100_tx_packet,
-					TX_PENDED_QUEUE_LENGTH, GFP_KERNEL);
+					TX_PENDED_QUEUE_LENGTH);
 	if (!priv->tx_buffers) {
 		bd_queue_free(priv, &priv->tx_queue);
 		return -ENOMEM;
@@ -4552,7 +4552,7 @@ static int ipw2100_rx_allocate(struct ipw2100_priv *priv)
 	 * allocate packets
 	 */
 	priv->rx_buffers = kmalloc_objs(struct ipw2100_rx_packet,
-					RX_QUEUE_LENGTH, GFP_KERNEL);
+					RX_QUEUE_LENGTH);
 	if (!priv->rx_buffers) {
 		IPW_DEBUG_INFO("can't allocate rx packet buffer table\n");
 
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index e045208e2531..dd64d21174e3 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -11278,7 +11278,7 @@ static int ipw_wdev_init(struct net_device *dev)
 		bg_band->band = NL80211_BAND_2GHZ;
 		bg_band->n_channels = geo->bg_channels;
 		bg_band->channels = kzalloc_objs(struct ieee80211_channel,
-						 geo->bg_channels, GFP_KERNEL);
+						 geo->bg_channels);
 		if (!bg_band->channels) {
 			rc = -ENOMEM;
 			goto out;
@@ -11316,7 +11316,7 @@ static int ipw_wdev_init(struct net_device *dev)
 		a_band->band = NL80211_BAND_5GHZ;
 		a_band->n_channels = geo->a_channels;
 		a_band->channels = kzalloc_objs(struct ieee80211_channel,
-						geo->a_channels, GFP_KERNEL);
+						geo->a_channels);
 		if (!a_band->channels) {
 			rc = -ENOMEM;
 			goto out;
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/tt.c b/drivers/net/wireless/intel/iwlwifi/dvm/tt.c
index 9bfdf033463b..fc9cf0531024 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/tt.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/tt.c
@@ -596,10 +596,9 @@ void iwl_tt_initialize(struct iwl_priv *priv)
 	if (priv->lib->adv_thermal_throttle) {
 		IWL_DEBUG_TEMP(priv, "Advanced Thermal Throttling\n");
 		tt->restriction = kzalloc_objs(struct iwl_tt_restriction,
-					       IWL_TI_STATE_MAX, GFP_KERNEL);
+					       IWL_TI_STATE_MAX);
 		tt->transaction = kzalloc_objs(struct iwl_tt_trans,
-					       IWL_TI_STATE_MAX * (IWL_TI_STATE_MAX - 1),
-					       GFP_KERNEL);
+					       IWL_TI_STATE_MAX * (IWL_TI_STATE_MAX - 1));
 		if (!tt->restriction || !tt->transaction) {
 			IWL_ERR(priv, "Fallback to Legacy Throttling\n");
 			priv->thermal_throttle.advanced_tt = false;
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c b/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c
index fb63c8ba800a..d39dd36b08e3 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c
@@ -132,7 +132,7 @@ int iwl_mld_low_latency_init(struct iwl_mld *mld)
 	unsigned long ts = jiffies;
 
 	ll->pkts_counters = kzalloc_objs(*ll->pkts_counters,
-					 mld->trans->info.num_rxqs, GFP_KERNEL);
+					 mld->trans->info.num_rxqs);
 	if (!ll->pkts_counters)
 		return -ENOMEM;
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/scan.c b/drivers/net/wireless/intel/iwlwifi/mld/scan.c
index 6679be028a6b..a1a4cf3ab3d3 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/scan.c
@@ -2084,8 +2084,7 @@ void iwl_mld_handle_channel_survey_notif(struct iwl_mld *mld,
 		}
 
 		mld->channel_survey = kzalloc_flex(*mld->channel_survey,
-						   channels, n_channels,
-						   GFP_KERNEL);
+						   channels, n_channels);
 
 		if (!mld->channel_survey)
 			return;
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/sta.c b/drivers/net/wireless/intel/iwlwifi/mld/sta.c
index 3b8ff0744e7c..6b7a89e050e6 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/sta.c
@@ -695,8 +695,7 @@ static void iwl_mld_alloc_mpdu_counters(struct iwl_mld *mld,
 		return;
 
 	mld_sta->mpdu_counters = kzalloc_objs(*mld_sta->mpdu_counters,
-				              mld->trans->info.num_rxqs,
-				              GFP_KERNEL);
+				              mld->trans->info.num_rxqs);
 	if (!mld_sta->mpdu_counters)
 		return;
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index aeaa1d4b312d..090791fe0638 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -4349,8 +4349,7 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw,
 
 			WARN_ON(rcu_access_pointer(mvmsta->ptk_pn[keyidx]));
 			ptk_pn = kzalloc_flex(*ptk_pn, q,
-					      mvm->trans->info.num_rxqs,
-					      GFP_KERNEL);
+					      mvm->trans->info.num_rxqs);
 			if (!ptk_pn) {
 				ret = -ENOMEM;
 				break;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 966558885ea6..79829f775c89 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -3604,7 +3604,7 @@ void iwl_mvm_rx_channel_survey_notif(struct iwl_mvm *mvm,
 		}
 
 		mvm->acs_survey = kzalloc_flex(*mvm->acs_survey, channels,
-					       n_channels, GFP_KERNEL);
+					       n_channels);
 
 		if (!mvm->acs_survey)
 			return;
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c
index 7c662d5f2b72..fe263cdc2e4f 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c
@@ -775,11 +775,10 @@ static int iwl_pcie_rx_alloc(struct iwl_trans *trans)
 
 	trans_pcie->rxq = kzalloc_objs(struct iwl_rxq, trans->info.num_rxqs);
 	trans_pcie->rx_pool = kzalloc_objs(trans_pcie->rx_pool[0],
-					   RX_POOL_SIZE(trans_pcie->num_rx_bufs),
-					   GFP_KERNEL);
+					   RX_POOL_SIZE(trans_pcie->num_rx_bufs));
 	trans_pcie->global_table =
 		kzalloc_objs(trans_pcie->global_table[0],
-			     RX_POOL_SIZE(trans_pcie->num_rx_bufs), GFP_KERNEL);
+			     RX_POOL_SIZE(trans_pcie->num_rx_bufs));
 	if (!trans_pcie->rxq || !trans_pcie->rx_pool ||
 	    !trans_pcie->global_table) {
 		ret = -ENOMEM;
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
index d7979d75b073..fdb3ba4f63c0 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
@@ -836,7 +836,7 @@ static int iwl_pcie_tx_alloc(struct iwl_trans *trans)
 
 	trans_pcie->txq_memory =
 		kzalloc_objs(struct iwl_txq,
-			     trans->mac_cfg->base->num_of_queues, GFP_KERNEL);
+			     trans->mac_cfg->base->num_of_queues);
 	if (!trans_pcie->txq_memory) {
 		IWL_ERR(trans, "Not enough memory for txq\n");
 		ret = -ENOMEM;
diff --git a/drivers/net/wireless/intersil/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c
index 148c110c5a2b..95580921d933 100644
--- a/drivers/net/wireless/intersil/p54/eeprom.c
+++ b/drivers/net/wireless/intersil/p54/eeprom.c
@@ -159,7 +159,7 @@ static int p54_generate_band(struct ieee80211_hw *dev,
 		goto err_out;
 
 	tmp->channels = kzalloc_objs(struct ieee80211_channel,
-				     list->band_channel_num[band], GFP_KERNEL);
+				     list->band_channel_num[band]);
 	if (!tmp->channels)
 		goto err_out;
 
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 63d9ccc5a81c..43704106cd80 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -4678,8 +4678,7 @@ int mwifiex_init_channel_scan_gap(struct mwifiex_adapter *adapter)
 	 */
 	adapter->num_in_chan_stats = 2 * (n_channels_bg + n_channels_a);
 	adapter->chan_stats = kzalloc_objs(*adapter->chan_stats,
-					   adapter->num_in_chan_stats,
-					   GFP_KERNEL);
+					   adapter->num_in_chan_stats);
 
 	if (!adapter->chan_stats)
 		return -ENOMEM;
diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
index 1bb30fbab12b..29e0f274575e 100644
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
@@ -390,7 +390,7 @@ int mwifiex_alloc_cmd_buffer(struct mwifiex_adapter *adapter)
 
 	/* Allocate and initialize struct cmd_ctrl_node */
 	cmd_array = kzalloc_objs(struct cmd_ctrl_node,
-				 MWIFIEX_NUM_OF_CMD_BUFFER, GFP_KERNEL);
+				 MWIFIEX_NUM_OF_CMD_BUFFER);
 	if (!cmd_array)
 		return -ENOMEM;
 
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
index 4e511f8700a8..97c0ec3b822e 100644
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -1510,7 +1510,7 @@ int mwifiex_scan_networks(struct mwifiex_private *priv,
 	}
 
 	scan_chan_list = kzalloc_objs(struct mwifiex_chan_scan_param_set,
-				      MWIFIEX_USER_SCAN_CHAN_MAX, GFP_KERNEL);
+				      MWIFIEX_USER_SCAN_CHAN_MAX);
 	if (!scan_chan_list) {
 		kfree(scan_cfg_out);
 		ret = -ENOMEM;
diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c
index 1b3fcc2b3355..d9c4dd6beaec 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/commands.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c
@@ -1253,7 +1253,7 @@ qtnf_cmd_resp_proc_mac_info(struct qtnf_wmac *mac,
 
 	mac_info->n_if_comb = resp_info->n_iface_combinations;
 	mac_info->if_comb = kzalloc_objs(*mac->macinfo.if_comb,
-					 mac->macinfo.n_if_comb, GFP_KERNEL);
+					 mac->macinfo.n_if_comb);
 
 	if (!mac->macinfo.if_comb)
 		return -ENOMEM;