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/ipv4 | |
| parent | 32a92f8c89326985e05dce8b22d3f0aa07a3e1bd (diff) | |
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>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/cipso_ipv4.c | 2 | ||||
| -rw-r--r-- | net/ipv4/devinet.c | 2 | ||||
| -rw-r--r-- | net/ipv4/nexthop.c | 2 | ||||
| -rw-r--r-- | net/ipv4/udp_tunnel_nic.c | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index 3fb181a3f3c0..a05aa075de1a 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c @@ -169,7 +169,7 @@ static int __init cipso_v4_cache_init(void) u32 iter; cipso_v4_cache = kzalloc_objs(struct cipso_v4_map_cache_bkt, - CIPSO_V4_CACHE_BUCKETS, GFP_KERNEL); + CIPSO_V4_CACHE_BUCKETS); if (!cipso_v4_cache) return -ENOMEM; diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 8f4190c7c9ab..537bb6c315d2 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -2755,7 +2755,7 @@ static __net_init int devinet_init_net(struct net *net) err = -ENOMEM; net->ipv4.inet_addr_lst = kmalloc_objs(struct hlist_head, - IN4_ADDR_HSIZE, GFP_KERNEL); + IN4_ADDR_HSIZE); if (!net->ipv4.inet_addr_lst) goto err_alloc_hash; diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c index defe6b30f18f..1aa2b05ee8de 100644 --- a/net/ipv4/nexthop.c +++ b/net/ipv4/nexthop.c @@ -714,7 +714,7 @@ static int nh_notifier_grp_hw_stats_init(struct nh_notifier_info *info, info->id = nh->id; info->type = NH_NOTIFIER_INFO_TYPE_GRP_HW_STATS; info->nh_grp_hw_stats = kzalloc_flex(*info->nh_grp_hw_stats, stats, - nhg->num_nh, GFP_KERNEL); + nhg->num_nh); if (!info->nh_grp_hw_stats) return -ENOMEM; diff --git a/net/ipv4/udp_tunnel_nic.c b/net/ipv4/udp_tunnel_nic.c index 9716e98b9291..9944ed923ddf 100644 --- a/net/ipv4/udp_tunnel_nic.c +++ b/net/ipv4/udp_tunnel_nic.c @@ -762,8 +762,7 @@ udp_tunnel_nic_alloc(const struct udp_tunnel_nic_info *info, for (i = 0; i < n_tables; i++) { utn->entries[i] = kzalloc_objs(*utn->entries[i], - info->tables[i].n_entries, - GFP_KERNEL); + info->tables[i].n_entries); if (!utn->entries[i]) goto err_free_prev_entries; } |