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 /drivers/net/dsa | |
| parent | 32a92f8c89326985e05dce8b22d3f0aa07a3e1bd (diff) | |
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 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/devlink.c | 6 | ||||
| -rw-r--r-- | drivers/net/dsa/sja1105/sja1105_vl.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/devlink.c b/drivers/net/dsa/mv88e6xxx/devlink.c index f241e7df6eb5..0f84bffc8ef1 100644 --- a/drivers/net/dsa/mv88e6xxx/devlink.c +++ b/drivers/net/dsa/mv88e6xxx/devlink.c @@ -379,7 +379,7 @@ static int mv88e6xxx_region_atu_snapshot(struct devlink *dl, int fid = -1, err = 0, count = 0; table = kzalloc_objs(struct mv88e6xxx_devlink_atu_entry, - mv88e6xxx_num_databases(chip), GFP_KERNEL); + mv88e6xxx_num_databases(chip)); if (!table) return -ENOMEM; @@ -440,7 +440,7 @@ static int mv88e6xxx_region_vtu_snapshot(struct devlink *dl, int err; table = kzalloc_objs(struct mv88e6xxx_devlink_vtu_entry, - mv88e6xxx_max_vid(chip) + 1, GFP_KERNEL); + mv88e6xxx_max_vid(chip) + 1); if (!table) return -ENOMEM; @@ -522,7 +522,7 @@ static int mv88e6xxx_region_stu_snapshot(struct devlink *dl, int err; table = kzalloc_objs(struct mv88e6xxx_devlink_stu_entry, - mv88e6xxx_max_sid(chip) + 1, GFP_KERNEL); + mv88e6xxx_max_sid(chip) + 1); if (!table) return -ENOMEM; diff --git a/drivers/net/dsa/sja1105/sja1105_vl.c b/drivers/net/dsa/sja1105/sja1105_vl.c index 7dd544fe26c6..0ae9cb5ea8d1 100644 --- a/drivers/net/dsa/sja1105/sja1105_vl.c +++ b/drivers/net/dsa/sja1105/sja1105_vl.c @@ -636,7 +636,7 @@ int sja1105_vl_gate(struct sja1105_private *priv, int port, rule->vl.cycle_time = cycle_time; rule->vl.num_entries = num_entries; rule->vl.entries = kzalloc_objs(struct action_gate_entry, - num_entries, GFP_KERNEL); + num_entries); if (!rule->vl.entries) { rc = -ENOMEM; goto out; |