diff options
| author | Kees Cook <kees@kernel.org> | 2026-02-21 23:46:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-22 08:26:33 -0800 |
| commit | 189f164e573e18d9f8876dbd3ad8fcbe11f93037 (patch) | |
| tree | 733382723a15ea29b7c9f3dde3bcb281f0b3c287 /net/wireless | |
| parent | 32a92f8c89326985e05dce8b22d3f0aa07a3e1bd (diff) | |
| download | linux-next-189f164e573e18d9f8876dbd3ad8fcbe11f93037.tar.gz linux-next-189f164e573e18d9f8876dbd3ad8fcbe11f93037.zip | |
Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL uses
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>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/core.c | 2 | ||||
| -rw-r--r-- | net/wireless/nl80211.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index bd53317e44ef..4b0645d56344 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -1001,7 +1001,7 @@ int wiphy_register(struct wiphy *wiphy) int idx; wiphy->radio_cfg = kzalloc_objs(*wiphy->radio_cfg, - wiphy->n_radio, GFP_KERNEL); + wiphy->n_radio); if (!wiphy->radio_cfg) return -ENOMEM; /* diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 2ea72c64b405..b94231c8441c 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -14308,7 +14308,7 @@ static int nl80211_set_cqm_rssi(struct genl_info *info, if (n_thresholds) { cqm_config = kzalloc_flex(*cqm_config, rssi_thresholds, - n_thresholds, GFP_KERNEL); + n_thresholds); if (!cqm_config) return -ENOMEM; @@ -15051,7 +15051,7 @@ static int nl80211_set_wowlan(struct sk_buff *skb, struct genl_info *info) return -EINVAL; new_triggers.patterns = kzalloc_objs(new_triggers.patterns[0], - n_patterns, GFP_KERNEL); + n_patterns); if (!new_triggers.patterns) return -ENOMEM; |